* improve portability of some format specifiers

  * fix new generated file distribution errors
  * switch Qt headers to old-style names (possible Qt3 support?)

ChangeLog

@@ -1,4 +1,7 @@
 current:
+  * fix new generated file distribution errors
+  * switch Qt headers to old-style names (possible Qt3 support?)
+  * add independent API versioning for GTK and Qt widget libraries
   * reimplement widget internals to support image scanning and
     improve locking efficiency
   * add image scanning to widgets. including builtin conversions from

configure.ac

@@ -21,6 +21,11 @@ dnl     then set age to 0.
 AC_SUBST([LIB_VERSION], [4:0:1])
 AC_SUBST([RELDATE], [2008-05-31])
 
+dnl widget libraries use their own versioning.
+dnl NB pygtk wrapper is *unversioned*
+AC_SUBST([ZGTK_LIB_VERSION], [0:0:0])
+AC_SUBST([ZQT_LIB_VERSION], [0:0:0])
+
 AC_DEFINE_UNQUOTED([ZEBRA_VERSION_MAJOR],
   [[`echo "$PACKAGE_VERSION" | sed -e 's/\..*$//'`]],
   [Program major version (before the '.') as a number])

gtk/Makefile.am.inc

@@ -1,6 +1,6 @@
 lib_LTLIBRARIES += gtk/libzebragtk.la
 gtk_libzebragtk_la_CPPFLAGS = -Igtk $(GTK_CFLAGS) $(AM_CPPFLAGS)
-gtk_libzebragtk_la_LDFLAGS = -version-info $(LIB_VERSION) $(AM_LDFLAGS)
+gtk_libzebragtk_la_LDFLAGS = -version-info $(ZGTK_LIB_VERSION) $(AM_LDFLAGS)
 gtk_libzebragtk_la_LIBADD = $(GTK_LIBS) zebra/libzebra.la $(AM_LIBADD)
 
 gtk_libzebragtk_la_SOURCES = gtk/zebragtk.c gtk/zebragtkprivate.h \

gtk/zebragtk.c

@@ -28,6 +28,10 @@
 #include "zebragtkprivate.h"
 #include "zebramarshal.h"
 
+#ifndef G_PARAM_STATIC_STRINGS
+# define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
+#endif
+
 #define DEFAULT_WIDTH 640
 #define DEFAULT_HEIGHT 480
 
@@ -303,7 +307,7 @@ static void *zebra_gtk_processing_thread (void *arg)
         else {
             gchar *dbg = g_strdup_value_contents(msg);
             g_warning("unknown message type (%x) passed to thread: %s\n",
-                      type, dbg);
+                      (unsigned)type, dbg);
             g_free(dbg);
         }
         g_value_unset(msg);

include/Makefile.am.inc

@@ -3,4 +3,5 @@ include_HEADERS = include/zebra.h
 zinclude_HEADERS = include/zebra/Scanner.h include/zebra/Decoder.h \
     include/zebra/Exception.h include/zebra/Symbol.h include/zebra/Image.h \
     include/zebra/ImageScanner.h include/zebra/Video.h include/zebra/Window.h \
-    include/zebra/Processor.h include/zebra/zebragtk.h include/zebra/QZebra.h
+    include/zebra/Processor.h include/zebra/zebragtk.h \
+    include/zebra/QZebra.h include/zebra/QZebraImage.h

include/zebra/QZebra.h

@@ -26,7 +26,7 @@
 /// @file
 /// Barcode Reader Qt4 Widget
 
-#include <QWidget>
+#include <qwidget.h>
 
 namespace zebra {
 

include/zebra/QZebraImage.h

@@ -26,7 +26,7 @@
 /// @file
 /// QImage to Image type conversion wrapper
 
-#include <QImage>
+#include <qimage.h>
 #include <zebra.h>
 
 namespace zebra {

qt/Makefile.am.inc

@@ -1,6 +1,6 @@
 lib_LTLIBRARIES += qt/libzebraqt.la
 qt_libzebraqt_la_CPPFLAGS = -Iqt $(QT_CFLAGS) $(AM_CPPFLAGS)
-#qt_libzebraqt_la_LDFLAGS = -version-info $(LIB_VERSION) $(AM_LDFLAGS)
+qt_libzebraqt_la_LDFLAGS = -version-info $(ZQT_LIB_VERSION) $(AM_LDFLAGS)
 qt_libzebraqt_la_LIBADD = $(QT_LIBS) zebra/libzebra.la $(AM_LIBADD)
 
 qt_libzebraqt_la_SOURCES = qt/QZebra.cpp qt/moc_QZebra.cpp \

qt/QZebra.cpp

@@ -21,8 +21,8 @@
 //  http://sourceforge.net/projects/zebra
 //------------------------------------------------------------------------
 
-#include <QResizeEvent>
-#include <QX11Info>
+#include <qevent.h>
+#include <qx11info_x11.h>
 #include <zebra/QZebra.h>
 #include "QZebraThread.h"
 

test/Makefile.am.inc

@@ -48,12 +48,12 @@ endif
 
 if HAVE_QT
 check_PROGRAMS += test/test_qt
-test_test_qt_SOURCES = test/test_qt.cpp test/scan_video.c
+test_test_qt_SOURCES = test/test_qt.cpp test/moc_test_qt.h test/scan_video.c
 test_test_qt_CPPFLAGS = -Itest $(QT_CFLAGS) $(AM_CPPFLAGS)
 test_test_qt_LDADD = $(QT_LIBS) qt/libzebraqt.la $(AM_LDADD)
-BUILT_SOURCES += test/moc_test_qt.cpp
+BUILT_SOURCES += test/moc_test_qt.h
 
-test/moc_%.cpp: test/%.cpp
+test/moc_%.h: test/%.cpp
 	$(MOC) -i $(test_test_qt_CPPFLAGS) $< -o $@
 endif
 

test/test_images.c

@@ -353,7 +353,7 @@ int test_image_bars (zebra_image_t *img)
     unsigned long datalen = planelen * fmt->bpp / 8;
     uint8_t *data = malloc(datalen);
     zebra_image_set_data(img, data, datalen, test_cleanup_handler);
-    fprintf(stderr, "create %.4s(%08x) image data %lx bytes @%p\n",
+    fprintf(stderr, "create %.4s(%08" PRIx32 ") image data %lx bytes @%p\n",
             (char*)&fmt->format, fmt->format, datalen, data);
 
     uint8_t *p = data;

test/test_qt.cpp

@@ -141,7 +141,7 @@ public Q_SLOTS:
     zebra::QZebra *zebra;
 };
 
-#include "moc_test_qt.cpp"
+#include "moc_test_qt.h"
 
 int main (int argc, char *argv[])
 {

zebra/convert.c

@@ -948,7 +948,7 @@ int _zebra_best_format (uint32_t src,
     if(!srcfmt)
         return(-1);
 
-    zprintf(8, "from %.4s(%08x) to", (char*)&src, src);
+    zprintf(8, "from %.4s(%08" PRIx32 ") to", (char*)&src, src);
     unsigned min_cost = -1;
     for(; *dsts; dsts++) {
         const zebra_format_def_t *dstfmt = _zebra_format_lookup(*dsts);
@@ -963,7 +963,8 @@ int _zebra_best_format (uint32_t src,
         else
             cost = conversions[srcfmt->group][dstfmt->group].cost;
         if(_zebra_verbosity >= 8)
-            fprintf(stderr, " %.4s(%08x)=%d", (char*)dsts, *dsts, cost);
+            fprintf(stderr, " %.4s(%08" PRIx32 ")=%d",
+                    (char*)dsts, *dsts, cost);
         if(min_cost > cost) {
             min_cost = cost;
             if(dst)
@@ -1013,10 +1014,11 @@ int zebra_negotiate_format (zebra_video_t *vdo,
         uint32_t win_fmt = 0;
         int cost = _zebra_best_format(*fmt, &win_fmt, dsts);
         if(cost < 0) {
-            zprintf(4, "%.4s(%08x) -> ? (unsupported)\n", (char*)fmt, *fmt);
+            zprintf(4, "%.4s(%08" PRIx32 ") -> ? (unsupported)\n",
+                    (char*)fmt, *fmt);
             continue;
         }
-        zprintf(4, "%.4s(%08x) -> %.4s(%08x) (%d)\n",
+        zprintf(4, "%.4s(%08" PRIx32 ") -> %.4s(%08" PRIx32 ") (%d)\n",
                 (char*)fmt, *fmt, (char*)&win_fmt, win_fmt, cost);
         if(min_cost > cost) {
             min_cost = cost;
@@ -1034,7 +1036,7 @@ int zebra_negotiate_format (zebra_video_t *vdo,
     if(!vdo)
         return(0);
 
-    zprintf(2, "setting best format %.4s(%08x) (%d)\n",
+    zprintf(2, "setting best format %.4s(%08" PRIx32 ") (%d)\n",
             (char*)&min_fmt, min_fmt, min_cost);
     return(zebra_video_init(vdo, min_fmt));
 }

zebra/image.c

@@ -163,11 +163,12 @@ int zebra_image_write (const zebra_image_t *img,
         n = snprintf(filename, len, "%s.%.4s.zimg",
                      filebase, (char*)&img->format);
     else
-        n = snprintf(filename, len, "%s.%08x.zimg", filebase, img->format);
+        n = snprintf(filename, len, "%s.%08" PRIx32 ".zimg",
+                     filebase, img->format);
     assert(n < len);
     filename[len] = '\0';
 
-    zprintf(1, "dumping %.4s(%08x) image to %s\n",
+    zprintf(1, "dumping %.4s(%08" PRIx32 ") image to %s\n",
             (char*)&img->format, img->format, filename);
 
     FILE *f = fopen(filename, "w");

zebra/processor.c

@@ -91,7 +91,7 @@ static inline int process_image (zebra_processor_t *proc,
 {
     if(img) {
         uint32_t format = zebra_image_get_format(img);
-        zprintf(16, "processing: %.4s(%08x) %dx%d @%p\n",
+        zprintf(16, "processing: %.4s(%08" PRIx32 ") %dx%d @%p\n",
                 (char*)&format, format,
                 zebra_image_get_width(img), zebra_image_get_height(img),
                 zebra_image_get_data(img));

zebra/window/ximage.c

@@ -78,9 +78,10 @@ static inline int ximage_init (zebra_window_t *w,
 
     if(!XInitImage(ximg))
         return(err_capture_int(w, SEV_ERROR, ZEBRA_ERR_XPROTO, __func__,
-                               "unable to init XImage for format %08x",
+                               "unable to init XImage for format %x",
                                w->format));
-    zprintf(3, "new XImage %.4s(%08x) %dx%d from %.4s(%08x) %dx%d\n",
+    zprintf(3, "new XImage %.4s(%08" PRIx32 ") %dx%d"
+            " from %.4s(%08" PRIx32 ") %dx%d\n",
             (char*)&w->format, w->format, ximg->width, ximg->height,
             (char*)&img->format, img->format, img->width, img->height);
     zprintf(4, "    masks: %08lx %08lx %08lx\n",
@@ -213,7 +214,7 @@ int _zebra_window_probe_ximage (zebra_window_t *w)
         int j, n = 0;
         for(j = 0; ximage_formats[fmtidx][j]; j++)
             if(!ximage_probe_format(w, ximage_formats[fmtidx][j])) {
-                zprintf(2, "    [%d] depth=%d bpp=%d: %.4s(%08x)\n",
+                zprintf(2, "    [%d] depth=%d bpp=%d: %.4s(%08" PRIx32 ")\n",
                         i, formats[i].depth, formats[i].bits_per_pixel,
                         (char*)&ximage_formats[fmtidx][j],
                         ximage_formats[fmtidx][j]);

zebra/window/xv.c

@@ -75,7 +75,8 @@ static inline int xv_init (zebra_window_t *w,
     w->src_height = img->height;
     XvImage *xvimg = XvCreateImage(w->display, w->img_port, w->format,
                                    NULL, img->width, img->height);
-    zprintf(3, "new XvImage %.4s(%08x) %dx%d(%d) from %.4s(%08x) %dx%d\n",
+    zprintf(3, "new XvImage %.4s(%08" PRIx32 ") %dx%d(%d)"
+            " from %.4s(%08" PRIx32 ") %dx%d\n",
             (char*)&w->format, w->format,
             xvimg->width, xvimg->height, xvimg->pitches[0],
             (char*)&img->format, img->format, img->width, img->height);