babl r272 - in trunk: . extensions

[neo svn gnome org]

Author: neo
Date: Thu Jan 10 21:22:05 2008
New Revision: 272
URL: http://svn.gnome.org/viewvc/babl?rev=272&view=rev

Log:
2008-01-10  Sven Neumann  <sven gimp org>

	* extensions/Makefile.am: extended CFLAGS so that config.h can 
be
	included.

	* extensions/*.c: fixed up includes.

	* extensions/gegl-fixups.c: use linear <-> gamma conversions 
from
	base/util.c.



Modified:
   trunk/ChangeLog
   trunk/extensions/CIE-Lab.c
   trunk/extensions/Makefile.am
   trunk/extensions/gegl-fixups.c
   trunk/extensions/gggl-lies.c
   trunk/extensions/gggl.c
   trunk/extensions/naive-CMYK.c

Modified: trunk/extensions/CIE-Lab.c
==============================================================================
--- trunk/extensions/CIE-Lab.c	(original)
+++ trunk/extensions/CIE-Lab.c	Thu Jan 10 21:22:05 2008
@@ -16,9 +16,13 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
+#include <math.h>
 #include <string.h>
+
 #include "babl.h"
-#include "util.h"
+
 
 int init (void);
 

Modified: trunk/extensions/Makefile.am
==============================================================================
--- trunk/extensions/Makefile.am	(original)
+++ trunk/extensions/Makefile.am	Thu Jan 10 21:22:05 2008
@@ -13,7 +13,11 @@
 
 all-local: $(SOBJS)
 
-CFLAGS  += -I $(top_srcdir)/babl -I $(top_srcdir)/extensions -fPIC
+CFLAGS += \
+	-I $(top_srcdir)		\
+	-I $(top_srcdir)/babl		\
+	-I $(top_srcdir)/extensions	\
+	-fPIC
 
 LDFLAGS += -shared
 

Modified: trunk/extensions/gegl-fixups.c
==============================================================================
--- trunk/extensions/gegl-fixups.c	(original)
+++ trunk/extensions/gegl-fixups.c	Thu Jan 10 21:22:05 2008
@@ -22,14 +22,6 @@
  *  Copyright 2003, 2004, 2005, 2007 Ãyvind KolÃs <pippin gimp org>
  */
 
-#include "babl.h"
-
-#define INLINE    inline
-
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
 /*
  * Implemented according to information read from:
  *
@@ -47,32 +39,14 @@
  * TODO: error diffusion,
  */
 
-#define BABL_USE_SRGB_GAMMA
-
-#ifdef BABL_USE_SRGB_GAMMA
+#include "config.h"
 
-static inline double
-linear_to_gamma_2_2 (double value)
-{
-  if (value > 0.0030402477F)
-    return 1.055F *pow (value, (1.0F / 2.4F)) - 0.055F;
-  return 12.92F * value;
-}
-
-static inline double
-gamma_2_2_to_linear (double value)
-{
-  if (value > 0.03928F)
-    return pow ((value + 0.055F) / 1.055F, 2.4F);
-  return value / 12.92F;
-}
+#include "babl.h"
 
+#include "base/util.h"
 
-#else
-  #define linear_to_gamma_2_2(value)    (pow ((value), (1.0F / 2.2F)))
-  #define gamma_2_2_to_linear(value)    (pow ((value), 2.2F))
-#endif
 
+#define INLINE    inline
 
 /* lookup tables used in conversion */
 

Modified: trunk/extensions/gggl-lies.c
==============================================================================
--- trunk/extensions/gggl-lies.c	(original)
+++ trunk/extensions/gggl-lies.c	Thu Jan 10 21:22:05 2008
@@ -1,7 +1,8 @@
 /*
  * This file was part of gggl, it implements a variety of pixel conversion
  * functions that are usable with babl, the file needs more cleanup, and
- * doesn't return the number of samples processed as a long, like it's supposed to.
+ * doesn't return the number of samples processed as a long, like it's
+ * supposed to.
  *
  *    GGGL is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -22,13 +23,16 @@
  *  Copyright 2003, 2004, 2005 Ãyvind KolÃs <pippin gimp org>
  */
 
+#include "config.h"
+
+#include <math.h>
+#include <string.h>
+
 #include "babl.h"
 
+
 #define INLINE    inline
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
 
 /*
  * Implemented according to information read from:

Modified: trunk/extensions/gggl.c
==============================================================================
--- trunk/extensions/gggl.c	(original)
+++ trunk/extensions/gggl.c	Thu Jan 10 21:22:05 2008
@@ -21,14 +21,16 @@
  *  Copyright 2003, 2004, 2005 Ãyvind KolÃs <pippin gimp org>
  */
 
-#include "babl.h"
-
-#define INLINE    inline
+#include "config.h"
 
 #include <math.h>
-#include <stdio.h>
 #include <string.h>
 
+#include "babl.h"
+
+
+#define INLINE    inline
+
 /*
  * Implemented according to information read from:
  *

Modified: trunk/extensions/naive-CMYK.c
==============================================================================
--- trunk/extensions/naive-CMYK.c	(original)
+++ trunk/extensions/naive-CMYK.c	Thu Jan 10 21:22:05 2008
@@ -16,21 +16,21 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include "config.h"
+
 #include <math.h>
-#include <assert.h>
+#include <string.h>
+
 #include "babl.h"
-#include "util.h"
 
-static long
-rgba_to_cmyk (char *src,
-              char *dst,
-              long  n);
 
-static long
-cmyk_to_rgba (char *src,
-              char *dst,
-              long  n);
+static long  rgba_to_cmyk (char *src,
+                           char *dst,
+                           long  n);
+
+static long  cmyk_to_rgba (char *src,
+                           char *dst,
+                           long  n);
 
 int init (void);