Changeset 2959

Timestamp:

Apr 10, 2012 4:12:19 PM (12 years ago)

Author:

gah

Message:

don't decode unencoded-strings (converting utf-8 string inadvertantly)

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• examples/zoo/drawing (added)
• examples/zoo/drawing/Makefile.in (added)
• examples/zoo/drawing/drawing.tcl (added)
• examples/zoo/drawing/tool.xml (added)
• gui/scripts/flowvisviewer.tcl (modified) (1 diff)
• lang/tcl/src/RpEncodeTclInterface.cc (modified) (2 diffs)

trunk/configure.in

@@ -335 +335 @@
     AC_MSG_ERROR(oops! no avpicture_get_size ?!?))
   AC_CHECK_FUNC(avpicture_fill,,AC_MSG_ERROR(oops! no avpicture_fill ?!?))
-
+  AC_CHECK_FUNCS(sws_getCachedContext)
+  AC_CHECK_FUNCS(img_convert)
+  AC_CHECK_FUNCS(sws_scale)
   AC_TRY_COMPILE([
 #define __STDC_CONSTANT_MACROS 1

trunk/gui/scripts/flowvisviewer.tcl

@@ -1053 +1053 @@
         } 
         "movie" {
-            puts stderr "read [string length $bytes] bytes type=$info(-type) token=$info(-token)"
             set tag $this-$info(-token)
             set _hardcopy($tag) $bytes

trunk/lang/tcl/src/RpEncodeTclInterface.cc

@@ -278 +278 @@
 
     string = Tcl_GetStringFromObj(objv[last], &numBytes);
-
+    if (switches.flags == 0) {
+        if (strncmp(string, "@@RP-ENC:", 9) != 0) {
+            /* This string doesn't have a header, so it's not encoded. 
+             * Just return the string as-is. */
+            Tcl_SetObjResult(interp, objv[last]);
+            return TCL_OK;
+        }
+    }
     Rappture::Buffer buf(string, numBytes); 
-
     Rappture::Outcome status;
     if (!Rappture::encoding::decode(status, buf, switches.flags)) {
@@ -286 +292 @@
         return TCL_ERROR;
     }
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), buf.bytes(), buf.size());
+    Tcl_SetByteArrayObj(Tcl_GetObjResult(interp), 
+                        (const unsigned char *)buf.bytes(), buf.size());
     return TCL_OK;
 }