babl r321 - in trunk: . babl

[jheller svn gnome org]

Author: jheller
Date: Tue Jun  3 14:11:34 2008
New Revision: 321
URL: http://svn.gnome.org/viewvc/babl?rev=321&view=rev

Log:
2008-06-03  Jan Heller  <jheller svn gnome org>

        babl_get_version () moved into separate source file.

        * babl/Makefile.am: Added babl-version.c.
        * babl/babl-version.c (babl_get_version): Implemented.
        * babl/babl-version.h.in: Added babl_get_version () declaration.
        * babl/babl.c: Removed babl_get_version ().
        * babl/babl.h: Removed babl_get_version () declaration.


Added:
   trunk/babl/babl-version.c
Modified:
   trunk/ChangeLog
   trunk/babl/Makefile.am
   trunk/babl/babl-version.h.in
   trunk/babl/babl.c
   trunk/babl/babl.h

Modified: trunk/babl/Makefile.am
==============================================================================
--- trunk/babl/Makefile.am	(original)
+++ trunk/babl/Makefile.am	Tue Jun  3 14:11:34 2008
@@ -30,7 +30,8 @@
 	babl-util.c			\
 	babl-list.c			\
 	babl-hash-table.c               \
-	babl-cpuaccel.c
+	babl-cpuaccel.c                 \
+	babl-version.c
 
 h_sources  =             		\
 	babl-db.h			\

Added: trunk/babl/babl-version.c
==============================================================================
--- (empty file)
+++ trunk/babl/babl-version.c	Tue Jun  3 14:11:34 2008
@@ -0,0 +1,35 @@
+/* babl - dynamically extendable universal pixel conversion library.
+ * Copyright (C) 2005-2008, Ãyvind KolÃs and others.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "babl-internal.h"
+
+
+void     
+babl_get_version (int *major,   
+                  int *minor,   
+                  int *micro)   
+{       
+  if (major != NULL)    
+    *major = BABL_MAJOR_VERSION;        
+                 
+  if (minor != NULL)    
+    *minor = BABL_MINOR_VERSION;        
+                 
+  if (micro != NULL)    
+    *micro = BABL_MICRO_VERSION;        
+}

Modified: trunk/babl/babl-version.h.in
==============================================================================
--- trunk/babl/babl-version.h.in	(original)
+++ trunk/babl/babl-version.h.in	Tue Jun  3 14:11:34 2008
@@ -31,4 +31,9 @@
 #define BABL_MINOR_VERSION @BABL_MINOR_VERSION@
 #define BABL_MICRO_VERSION @BABL_MICRO_VERSION@
 
+/** Get the version information on the babl library */
+void   babl_get_version (int *major,
+                         int *minor,
+                         int *micro);
+
 #endif

Modified: trunk/babl/babl.c
==============================================================================
--- trunk/babl/babl.c	(original)
+++ trunk/babl/babl.c	Tue Jun  3 14:11:34 2008
@@ -74,18 +74,3 @@
       babl_memory_sanity ();
     }
 }
-
-void     
-babl_get_version (int *major,   
-                  int *minor,   
-                  int *micro)   
-{       
-  if (major != NULL)    
-    *major = BABL_MAJOR_VERSION;        
-                 
-  if (minor != NULL)    
-    *minor = BABL_MINOR_VERSION;        
-                 
-  if (micro != NULL)    
-    *micro = BABL_MICRO_VERSION;        
-}

Modified: trunk/babl/babl.h
==============================================================================
--- trunk/babl/babl.h	(original)
+++ trunk/babl/babl.h	Tue Jun  3 14:11:34 2008
@@ -81,11 +81,6 @@
  */
 void   babl_destroy    (void);
 
-/** Get the version information on the babl library */
-void   babl_get_version (int *major,
-                         int *minor,
-                         int *micro);
-
 #if     __GNUC__ >= 4
 #define BABL_ARG_NULL_TERMINATED __attribute__((__sentinel__))
 #else