babl r384 - in trunk: . babl

[neo svn gnome org]

Author: neo
Date: Sun Jan 18 10:36:09 2009
New Revision: 384
URL: http://svn.gnome.org/viewvc/babl?rev=384&view=rev

Log:
2009-01-18  Sven Neumann  <sven gimp org>

	* babl/babl-component.h
	* babl/babl-conversion.h
	* babl/babl-extension.h
	* babl/babl-format.h
	* babl/babl-model.h
	* babl/babl-type.h: allow to disable the defines that were added
	for backward compatibility by definining 
BABL_DISABLE_DEPRECATED.

	* babl/babl-image.h: removed trailing whitespace.



Modified:
   trunk/ChangeLog
   trunk/babl/babl-component.h
   trunk/babl/babl-conversion.h
   trunk/babl/babl-extension.h
   trunk/babl/babl-format.h
   trunk/babl/babl-image.h
   trunk/babl/babl-model.h
   trunk/babl/babl-type.h

Modified: trunk/babl/babl-component.h
==============================================================================
--- trunk/babl/babl-component.h	(original)
+++ trunk/babl/babl-component.h	Sun Jan 18 10:36:09 2009
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 
@@ -29,8 +29,13 @@
  *                            NULL);
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_component babl_component_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance     instance;

Modified: trunk/babl/babl-conversion.h
==============================================================================
--- trunk/babl/babl-conversion.h	(original)
+++ trunk/babl/babl-conversion.h	Sun Jan 18 10:36:09 2009
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -31,8 +31,13 @@
  *                              NULL);
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_conversion babl_conversion_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 /* Type and Format */
 typedef long (*BablFuncLinear)    (char  *src,
                                    char  *dst,

Modified: trunk/babl/babl-extension.h
==============================================================================
--- trunk/babl/babl-extension.h	(original)
+++ trunk/babl/babl-extension.h	Sun Jan 18 10:36:09 2009
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -27,8 +27,13 @@
  * BablExtension objects are only used internally in babl.
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_extension babl_extension_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance   instance; /* path to .so / .dll is stored in instance name */

Modified: trunk/babl/babl-format.h
==============================================================================
--- trunk/babl/babl-format.h	(original)
+++ trunk/babl/babl-format.h	Sun Jan 18 10:36:09 2009
@@ -41,8 +41,13 @@
  * name is used.
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_format babl_format_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance     instance;

Modified: trunk/babl/babl-image.h
==============================================================================
--- trunk/babl/babl-image.h	(original)
+++ trunk/babl/babl-image.h	Sun Jan 18 10:36:09 2009
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -29,7 +29,7 @@
  * passed to babl_process, two different babl_process() functions will be
  * needed for this since the polymorphism cannot be trusted to work on linear
  * buffers that originate outside babl's control.
- * 
+ *
  * Babl * babl_image_new (BablComponent *component1,
  *                        void          *data,
  *                        int            pitch,

Modified: trunk/babl/babl-model.h
==============================================================================
--- trunk/babl/babl-model.h	(original)
+++ trunk/babl/babl-model.h	Sun Jan 18 10:36:09 2009
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -34,13 +34,19 @@
  *
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_model babl_model_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance     instance;
   BablList         *from_list;
   int              components;
   BablComponent  **component;
-  BablType       **type; /*< must be doubles, used here for convenience in code */
+  BablType       **type; /*< must be doubles,
+                             used here for convenience in code */
 } BablModel;

Modified: trunk/babl/babl-type.h
==============================================================================
--- trunk/babl/babl-type.h	(original)
+++ trunk/babl/babl-type.h	Sun Jan 18 10:36:09 2009
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -35,8 +35,13 @@
  *                         NULL);
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_type babl_type_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance     instance;