[Emacs-diffs] trunk r117238: * image.c (x_query_frame_background_color)

[Dmitry Antipov]

------------------------------------------------------------
revno: 117238
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-02 21:55:38 +0400
message:
  * image.c (x_query_frame_background_color)
  [HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG]:
  Fix --enable-gcc-warnings compilation without image libraries.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-02 17:08:50 +0000
+++ b/src/ChangeLog     2014-06-02 17:55:38 +0000
@@ -1,3 +1,9 @@
+2014-06-02  Dmitry Antipov  <address@hidden>
+
+       * image.c (x_query_frame_background_color)
+       [HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG]:
+       Fix --enable-gcc-warnings compilation without image libraries.
+
 2014-06-02  Eli Zaretskii  <address@hidden>
 
        * w32heap.c (malloc_after_dump, realloc_after_dump): Update the

=== modified file 'src/image.c'
--- a/src/image.c       2014-05-27 17:31:17 +0000
+++ b/src/image.c       2014-06-02 17:55:38 +0000
@@ -1236,6 +1236,9 @@
   return img->background_transparent;
 }
 
+#if defined (HAVE_PNG) || defined (HAVE_NS) \
+  || defined (HAVE_IMAGEMAGICK) || defined (HAVE_RSVG)
+
 /* Store F's background color into *BGCOLOR.  */
 static void
 x_query_frame_background_color (struct frame *f, XColor *bgcolor)
@@ -1248,7 +1251,8 @@
 #endif
 }
 
-
+#endif /* HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG */
+
 /***********************************************************************
                  Helper functions for X image types
  ***********************************************************************/