Permalink
Browse files

libgimpcolor: add GdkPixbuf <-> GeglBuffer utility functions

and update tons of includes in libgimp and app.
  • Loading branch information...
1 parent 105219e commit 3ad73b36583438ac993aac7ef7cbc6883b54f7ad @mitchfoo mitchfoo committed May 3, 2012
Showing with 374 additions and 129 deletions.
  1. +2 −2 app/composite/Makefile.am
  2. +2 −2 app/composite/gimp-composite-generic.c
  3. +2 −2 app/config/gimpconfig-dump.c
  4. +2 −2 app/config/gimpcoreconfig.c
  5. +2 −2 app/config/gimpdisplayconfig.c
  6. +2 −2 app/config/gimpdisplayoptions.c
  7. +2 −2 app/config/gimprc-deserialize.c
  8. +1 −0 app/core/gimp-cairo.c
  9. +1 −0 app/core/gimp-edit.c
  10. +1 −0 app/core/gimp-utils.c
  11. +4 −2 app/core/gimpbuffer.c
  12. +1 −0 app/core/gimpchannel-project.c
  13. +1 −0 app/core/gimpchannel.c
  14. +1 −0 app/core/gimpcontext.c
  15. +1 −0 app/core/gimpdrawable-blend.c
  16. +1 −0 app/core/gimpdrawable-bucket-fill.c
  17. +1 −0 app/core/gimpdrawable-offset.c
  18. +1 −0 app/core/gimpdrawable-stroke.c
  19. +1 −0 app/core/gimpdrawable-transform.c
  20. +1 −0 app/core/gimpdrawable.c
  21. +1 −0 app/core/gimpgradient-load.c
  22. +1 −0 app/core/gimpgradient.c
  23. +1 −0 app/core/gimpgrid.c
  24. +1 −0 app/core/gimpimage-colormap.c
  25. +1 −0 app/core/gimpimage-contiguous-region.c
  26. +1 −0 app/core/gimpimage-convert.c
  27. +1 −0 app/core/gimpimage-merge.c
  28. +1 −0 app/core/gimpimage-quick-mask.c
  29. +1 −0 app/core/gimpimage.c
  30. +1 −0 app/core/gimpimageundo.c
  31. +1 −0 app/core/gimplayer.c
  32. +1 −0 app/core/gimppalette-import.c
  33. +1 −0 app/core/gimppalette-load.c
  34. +1 −0 app/core/gimppalette-save.c
  35. +1 −0 app/core/gimppalette.c
  36. +1 −0 app/core/gimpparamspecs-duplicate.c
  37. +4 −3 app/core/gimppattern-load.c
  38. +1 −0 app/core/gimppickable.c
  39. +3 −2 app/core/gimpviewable.c
  40. +1 −0 app/gegl/gimp-gegl-config-proxy.c
  41. +0 −35 app/gegl/gimp-gegl-utils.c
  42. +0 −4 app/gegl/gimp-gegl-utils.h
  43. +1 −0 app/gegl/gimpcolorbalanceconfig.c
  44. +1 −0 app/gegl/gimpcurvesconfig.c
  45. +1 −0 app/gegl/gimplevelsconfig.c
  46. +1 −0 app/gegl/gimpoperationborder.c
  47. +1 −0 app/gegl/gimpoperationbrightnesscontrast.c
  48. +1 −0 app/gegl/gimpoperationcagetransform.c
  49. +1 −0 app/gegl/gimpoperationcolorbalance.c
  50. +1 −0 app/gegl/gimpoperationcolorize.c
  51. +0 −1 app/gegl/gimpoperationcurves.c
  52. +1 −0 app/gegl/gimpoperationdesaturate.c
  53. +1 −0 app/gegl/gimpoperationequalize.c
  54. +1 −0 app/gegl/gimpoperationgrow.c
  55. +1 −0 app/gegl/gimpoperationhuesaturation.c
  56. +0 −1 app/gegl/gimpoperationlevels.c
  57. +1 −0 app/gegl/gimpoperationpointlayermode.c
  58. +0 −1 app/gegl/gimpoperationposterize.c
  59. +1 −0 app/gegl/gimpoperationshapeburst.c
  60. +1 −0 app/gegl/gimpoperationshrink.c
  61. +0 −2 app/gegl/gimpoperationthreshold.c
  62. +1 −1 app/paint-funcs/Makefile.am
  63. +1 −0 app/paint-funcs/paint-funcs.c
  64. +0 −3 app/paint/gimpairbrush.c
  65. +1 −0 app/paint/gimppaintbrush.c
  66. +2 −0 app/pdb/brush-cmds.c
  67. +2 −0 app/pdb/brush-select-cmds.c
  68. +2 −0 app/pdb/brushes-cmds.c
  69. +2 −0 app/pdb/buffer-cmds.c
  70. +2 −0 app/pdb/channel-cmds.c
  71. +2 −0 app/pdb/color-cmds.c
  72. +2 −0 app/pdb/context-cmds.c
  73. +2 −0 app/pdb/convert-cmds.c
  74. +2 −0 app/pdb/display-cmds.c
  75. +2 −0 app/pdb/drawable-cmds.c
  76. +2 −0 app/pdb/drawable-transform-cmds.c
  77. +2 −0 app/pdb/dynamics-cmds.c
  78. +2 −0 app/pdb/edit-cmds.c
  79. +2 −0 app/pdb/fileops-cmds.c
  80. +2 −0 app/pdb/floating-sel-cmds.c
  81. +2 −0 app/pdb/font-select-cmds.c
  82. +2 −0 app/pdb/fonts-cmds.c
  83. +2 −0 app/pdb/gimp-cmds.c
  84. +1 −0 app/pdb/gimp-pdb-compat.c
  85. +2 −0 app/pdb/gimprc-cmds.c
  86. +2 −0 app/pdb/gradient-cmds.c
  87. +2 −0 app/pdb/gradient-select-cmds.c
  88. +2 −0 app/pdb/gradients-cmds.c
  89. +2 −0 app/pdb/grid-cmds.c
  90. +2 −0 app/pdb/guides-cmds.c
  91. +2 −0 app/pdb/help-cmds.c
  92. +2 −0 app/pdb/image-cmds.c
  93. +2 −0 app/pdb/image-select-cmds.c
  94. +2 −0 app/pdb/item-cmds.c
  95. +2 −0 app/pdb/item-transform-cmds.c
  96. +2 −0 app/pdb/layer-cmds.c
  97. +2 −0 app/pdb/message-cmds.c
  98. +2 −0 app/pdb/paint-tools-cmds.c
  99. +2 −0 app/pdb/palette-cmds.c
  100. +2 −0 app/pdb/palette-select-cmds.c
  101. +2 −0 app/pdb/palettes-cmds.c
  102. +2 −0 app/pdb/paths-cmds.c
  103. +2 −0 app/pdb/pattern-cmds.c
  104. +2 −0 app/pdb/pattern-select-cmds.c
  105. +2 −0 app/pdb/patterns-cmds.c
  106. +2 −0 app/pdb/plug-in-cmds.c
  107. +2 −0 app/pdb/plug-in-compat-cmds.c
  108. +2 −0 app/pdb/procedural-db-cmds.c
  109. +2 −0 app/pdb/progress-cmds.c
  110. +2 −0 app/pdb/selection-cmds.c
  111. +2 −0 app/pdb/selection-tools-cmds.c
  112. +2 −0 app/pdb/text-layer-cmds.c
  113. +2 −0 app/pdb/text-tool-cmds.c
  114. +2 −0 app/pdb/transform-tools-cmds.c
  115. +2 −0 app/pdb/undo-cmds.c
  116. +2 −0 app/pdb/unit-cmds.c
  117. +2 −0 app/pdb/vectors-cmds.c
  118. +1 −0 app/plug-in/plug-in-params.c
  119. +1 −0 app/text/gimptext-compat.c
  120. +1 −0 app/text/gimptext-parasite.c
  121. +1 −0 app/text/gimptext.c
  122. +1 −0 app/text/gimptextlayout.c
  123. +2 −1 app/vectors/gimpvectors.c
  124. +1 −0 app/xcf/xcf-load.c
  125. +1 −0 app/xcf/xcf-save.c
  126. +3 −3 libgimp/gimppixbuf.h
  127. +10 −7 libgimpcolor/Makefile.am
  128. +2 −0 libgimpcolor/gimpcolor.def
  129. +1 −0 libgimpcolor/gimpcolor.h
  130. +87 −0 libgimpcolor/gimppixbuf.c
  131. +40 −0 libgimpcolor/gimppixbuf.h
  132. +6 −6 libgimpconfig/Makefile.am
  133. +2 −2 libgimpconfig/gimpcolorconfig.c
  134. +2 −2 libgimpconfig/gimpconfig-deserialize.c
  135. +2 −2 libgimpconfig/gimpconfig-serialize.c
  136. +2 −2 libgimpconfig/gimpscanner.c
  137. +2 −2 libgimpwidgets/Makefile.am
  138. +1 −1 libgimpwidgets/gimpcairo-utils.c
  139. +1 −1 libgimpwidgets/gimpcellrenderercolor.c
  140. +1 −1 libgimpwidgets/gimpcolorarea.c
  141. +1 −1 libgimpwidgets/gimpcolorbutton.c
  142. +1 −1 libgimpwidgets/gimpcolordisplay.c
  143. +1 −1 libgimpwidgets/gimpcolordisplaystack.c
  144. +1 −1 libgimpwidgets/gimpcolorhexentry.c
  145. +1 −1 libgimpwidgets/gimpcolornotebook.c
  146. +1 −1 libgimpwidgets/gimpcolorscale.c
  147. +1 −1 libgimpwidgets/gimpcolorscales.c
  148. +1 −1 libgimpwidgets/gimpcolorselect.c
  149. +1 −1 libgimpwidgets/gimpcolorselection.c
  150. +1 −1 libgimpwidgets/gimpcolorselector.c
  151. +1 −1 libgimpwidgets/gimpcontroller.c
  152. +1 −1 libgimpwidgets/gimppickbutton.c
  153. +1 −1 libgimpwidgets/gimppropwidgets.c
  154. +1 −1 libgimpwidgets/gimpscaleentry.c
  155. +1 −1 libgimpwidgets/gimpwidgets.c
  156. +1 −1 modules/Makefile.am
  157. +1 −1 modules/color-selector-cmyk-lcms.c
  158. +1 −1 modules/color-selector-cmyk.c
  159. +1 −1 modules/color-selector-water.c
  160. +1 −1 modules/color-selector-wheel.c
  161. +1 −1 modules/display-filter-color-blind.c
  162. +1 −1 modules/display-filter-gamma.c
  163. +1 −1 modules/display-filter-high-contrast.c
  164. +1 −1 modules/display-filter-lcms.c
  165. +1 −1 modules/display-filter-proof.c
  166. +1 −5 plug-ins/pygimp/pygimpcolor.h
  167. +1 −0 tools/pdbgen/app.pl
@@ -11,9 +11,9 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
- $(BABL_CFLAGS) \
+ $(GEGL_CFLAGS) \
$(CAIRO_CFLAGS) \
- $(GLIB_CFLAGS) \
+ $(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
composite_libraries = \
@@ -26,9 +26,9 @@
#include <string.h>
#include <stdio.h>
-#include <babl/babl.h>
#include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
@@ -27,9 +27,9 @@
#include <unistd.h>
#endif
-#include <babl/babl.h>
#include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -20,9 +20,9 @@
#include "config.h"
-#include <babl/babl.h>
#include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -20,9 +20,9 @@
#include "config.h"
-#include <babl/babl.h>
#include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -20,9 +20,9 @@
#include "config.h"
-#include <babl/babl.h>
#include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpmath/gimpmath.h"
@@ -20,9 +20,9 @@
#include "config.h"
-#include <babl/babl.h>
#include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
@@ -25,6 +25,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -48,6 +48,7 @@
#include <cairo.h>
#include <gegl.h>
#include <gobject/gvaluecollector.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpmath/gimpmath.h"
@@ -17,13 +17,15 @@
#include "config.h"
+#include <cairo.h>
#include <gegl.h>
-#include <glib-object.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
#include "core-types.h"
#include "gegl/gimp-babl.h"
-#include "gegl/gimp-gegl-utils.h"
#include "gimp-utils.h"
#include "gimpbuffer.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
@@ -22,6 +22,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -22,6 +22,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpmath/gimpmath.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
@@ -22,6 +22,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpmath/gimpmath.h"
@@ -22,6 +22,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -20,6 +20,7 @@
#include <cairo.h>
#include <gegl.h>
#include <gegl-plugin.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -24,6 +24,7 @@
#include <cairo.h>
#include <gegl.h>
#include <glib/gstdio.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
View
@@ -24,6 +24,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
@@ -134,6 +134,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
@@ -19,6 +19,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
@@ -19,6 +19,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
@@ -22,6 +22,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -22,6 +22,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -33,6 +33,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
#ifdef G_OS_WIN32
@@ -27,6 +27,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
#include "libgimpbase/gimpbase.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
@@ -23,6 +23,7 @@
#include <cairo.h>
#include <gegl.h>
#include <gegl-paramspecs.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpconfig/gimpconfig.h"
@@ -30,7 +30,7 @@
#include <fcntl.h>
-#include <gegl.h>
+#include <glib.h>
#include <glib/gstdio.h>
#ifdef G_OS_WIN32
@@ -41,14 +41,15 @@
#define _O_BINARY 0
#endif
+#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
#include "core-types.h"
-#include "gegl/gimp-gegl-utils.h"
-
#include "gimppattern.h"
#include "gimppattern-header.h"
#include "gimppattern-load.h"
@@ -28,6 +28,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
@@ -22,15 +22,16 @@
#include <string.h>
+#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "libgimpconfig/gimpconfig.h"
#include "core-types.h"
-#include "gegl/gimp-gegl-utils.h"
-
#include "gimp-utils.h"
#include "gimpcontext.h"
#include "gimpmarshal.h"
@@ -21,6 +21,7 @@
#include <cairo.h>
#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpconfig/gimpconfig.h"
Oops, something went wrong. Retry.

0 comments on commit 3ad73b3

Please sign in to comment.