misc webp bits

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index aef1561f826a1e1e9a44c0dbed4a1bb56e96e311..750e9644e21ce4ae2c9565cc16d3f1a162874749 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -118,6 +118,10 @@ endif
 if WITH_PANGOCAIRO
 dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS)
 dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS)
+if WITH_WEBP
+dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS)
+dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS)
+endif
 endif
 
 EXTRA_DIST = Makefile.old dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj

diff --git a/cmd/dot/dot_builtins.c b/cmd/dot/dot_builtins.c
index 1ae1d800aae0dc17166de178b534ff54fced15f3..2a83732435358e90fc2ef4b2684fc1d76d4c1fda 100644 (file)
--- a/cmd/dot/dot_builtins.c
+++ b/cmd/dot/dot_builtins.c
@@ -28,6 +28,9 @@ extern gvplugin_library_t gvplugin_gd_LTX_library;
 #endif
 #ifdef HAVE_PANGOCAIRO
 extern gvplugin_library_t gvplugin_pango_LTX_library;
+#ifdef HAVE_WEBP
+extern gvplugin_library_t gvplugin_webp_LTX_library;
+#endif
 #endif
 extern gvplugin_library_t gvplugin_core_LTX_library;
 
@@ -37,6 +40,9 @@ lt_symlist_t lt_preloaded_symbols[] = {
        { "gvplugin_neato_layout_LTX_library", (void*)(&gvplugin_neato_layout_LTX_library) },
 #ifdef HAVE_PANGOCAIRO
        { "gvplugin_pango_LTX_library", (void*)(&gvplugin_pango_LTX_library) },
+#ifdef HAVE_WEBP
+       { "gvplugin_webp_LTX_library", (void*)(&gvplugin_webp_LTX_library) },
+#endif
 #endif
 #ifdef HAVE_LIBGD
        { "gvplugin_gd_LTX_library", (void*)(&gvplugin_gd_LTX_library) },

diff --git a/plugin/webp/gvdevice_webp.c b/plugin/webp/gvdevice_webp.c
index 8df9a41c76d36351cb0b976eaeed7f9301aadf9b..ff8ef0943cc809d5b87dedbdd4fa59f909342125 100644 (file)
--- a/plugin/webp/gvdevice_webp.c
+++ b/plugin/webp/gvdevice_webp.c
@@ -146,7 +146,7 @@ static gvdevice_features_t device_features_webp = {
 
 gvplugin_installed_t gvdevice_webp_types[] = {
 #ifdef HAVE_WEBP
-    {FORMAT_WEBP, "webp:cairo", -1, &webp_engine, &device_features_webp},
+    {FORMAT_WEBP, "webp:cairo", 1, &webp_engine, &device_features_webp},
 #endif
     {0, NULL, 0, NULL, NULL}
 };

diff --git a/plugin/webp/gvloadimage_webp.c b/plugin/webp/gvloadimage_webp.c
index 51bbb013ec1ec60c2260cfd3d2e7ed5e280ea46a..3c05fb15b5c28f6a9d8889d387a6520749ed686d 100644 (file)
--- a/plugin/webp/gvloadimage_webp.c
+++ b/plugin/webp/gvloadimage_webp.c
@@ -95,15 +95,15 @@ end:
        return NULL;
     }
 
-#if 1
+#if 0
     fprintf(stderr, "Info: WebP file %s can be decoded (dimensions: %d x %d)%s.\n",
        in_file, output_buffer->width, output_buffer->height,
        bitstream->has_alpha ? " (with alpha)" : "");
 #endif
 
-#if 0
+#if 1
 
-    // FIXME - this statement dies....
+    // FIXME - this statement dies....    but works in dot_static!!!
     
     surface = cairo_image_surface_create_for_data (
            output_buffer->u.RGBA.rgba,