[gimp/metadata-browser] app: remove paint-funcs-types.h

[Roman Joost <romanofski src gnome org>]

commit 6e050f59d79142c390e3d67a56b6b9e4f0b318b0
Author: Michael Natterer <mitch gimp org>
Date:   Sat May 19 01:13:21 2012 +0200

    app: remove paint-funcs-types.h

 app/actions/colormap-commands.c     |    2 +-
 app/base/base-types.h               |    2 --
 app/core/gimpbrushclipboard.c       |    2 +-
 app/core/gimpimage-colormap.c       |    2 +-
 app/paint-funcs/Makefile.am         |    1 -
 app/paint-funcs/paint-funcs-types.h |   30 ------------------------------
 app/paint/gimpbrushcore.c           |    2 +-
 7 files changed, 4 insertions(+), 37 deletions(-)
---
diff --git a/app/actions/colormap-commands.c b/app/actions/colormap-commands.c
index 3a522d6..7ac5fa7 100644
--- a/app/actions/colormap-commands.c
+++ b/app/actions/colormap-commands.c
@@ -68,7 +68,7 @@ colormap_edit_color_cmd_callback (GtkAction *action,
                        colormap[editor->col_index * 3],
                        colormap[editor->col_index * 3 + 1],
                        colormap[editor->col_index * 3 + 2],
-                       OPAQUE_OPACITY);
+                       255);
 
   desc = g_strdup_printf (_("Edit colormap entry #%d"), editor->col_index);
 
diff --git a/app/base/base-types.h b/app/base/base-types.h
index ed033e0..44fb2eb 100644
--- a/app/base/base-types.h
+++ b/app/base/base-types.h
@@ -19,8 +19,6 @@
 #define __BASE_TYPES_H__
 
 
-#include "paint-funcs/paint-funcs-types.h"
-
 #include "core/core-types.h" /* screw include policy in base/ */
 
 
diff --git a/app/core/gimpbrushclipboard.c b/app/core/gimpbrushclipboard.c
index 16b5517..81c45db 100644
--- a/app/core/gimpbrushclipboard.c
+++ b/app/core/gimpbrushclipboard.c
@@ -217,7 +217,7 @@ gimp_brush_clipboard_buffer_changed (Gimp      *gimp,
         }
       else
         {
-          memset (gimp_temp_buf_get_data (brush->mask), OPAQUE_OPACITY,
+          memset (gimp_temp_buf_get_data (brush->mask), 255,
                   width * height);
         }
 
diff --git a/app/core/gimpimage-colormap.c b/app/core/gimpimage-colormap.c
index 80c9399..3d7bfdf 100644
--- a/app/core/gimpimage-colormap.c
+++ b/app/core/gimpimage-colormap.c
@@ -253,7 +253,7 @@ gimp_image_get_colormap_entry (GimpImage *image,
                        private->colormap[color_index * 3],
                        private->colormap[color_index * 3 + 1],
                        private->colormap[color_index * 3 + 2],
-                       OPAQUE_OPACITY);
+                       255);
 }
 
 void
diff --git a/app/paint-funcs/Makefile.am b/app/paint-funcs/Makefile.am
index e119f35..cd70dda 100644
--- a/app/paint-funcs/Makefile.am
+++ b/app/paint-funcs/Makefile.am
@@ -23,6 +23,5 @@ noinst_LIBRARIES = libapppaint-funcs.a
 libapppaint_funcs_a_SOURCES = \
 	paint-funcs.c		\
 	paint-funcs.h		\
-	paint-funcs-types.h	\
 	subsample-region.c	\
 	subsample-region.h
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index 0492ba0..481f98c 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -1367,7 +1367,7 @@ gimp_brush_core_solidify_mask (GimpBrushCore     *core,
   for (i = 0; i < brush_mask_height; i++)
     {
       for (j = 0; j < brush_mask_width; j++)
-        *d++ = (*m++) ? OPAQUE_OPACITY : TRANSPARENT_OPACITY;
+        *d++ = (*m++) ? 255 : 0;
 
       d += 2;
     }