Changeset 659 for trunk

Timestamp:

Apr 3, 2007, 4:22:00 PM (17 years ago)

Author:

dkearney

Message:

fixed encoding errors found by nick, now data returned to the user by the decode function is converted to utf-8.
previously i think the data was being converted to unicode by the append to obj function.

File:

• trunk/src/tcl/src/RpEncodeTclInterface.cc (modified) (2 diffs)

trunk/src/tcl/src/RpEncodeTclInterface.cc

@@ -257 +257 @@
 
     option = (const char*) Tcl_GetByteArrayFromObj(objv[nextarg++], &optionLen);
-
     if (strncmp(option,"@@RP-ENC:z\n",11) == 0) {
         buf = Rappture::Buffer(option+11,optionLen-11);
@@ -420 +419 @@
 
     buf.decode(decompress,base64);
+
     result = Tcl_GetObjResult(interp);
 
-    Tcl_AppendToObj(result,buf.bytes(),buf.size());
+    Tcl_DString dstPtr;
+    Tcl_DStringInit(&dstPtr);
+    Tcl_ExternalToUtfDString(NULL,buf.bytes(),buf.size(),&dstPtr);
+    Tcl_AppendToObj(result,Tcl_DStringValue(&dstPtr),Tcl_DStringLength(&dstPtr));
+    Tcl_DStringFree(&dstPtr);
 
     return TCL_OK;