GNOME.org
 

gimp r25208 - in trunk: . plug-ins/bmp plug-ins/fits plug-ins/sgi

Author: mitch
Date: Mon Mar 24 22:07:14 2008
New Revision: 25208
URL: http://svn.gnome.org/viewvc/gimp?rev=25208&view=rev

Log:
2008-03-24  Michael Natterer  <mitch gimp org>

	* plug-ins/bmp/*
	* plug-ins/fits/*
	* plug-ins/sgi/*: renamed files.



Added:
   trunk/plug-ins/bmp/bmp-read.c
      - copied unchanged from r25196, /trunk/plug-ins/bmp/bmpread.c
   trunk/plug-ins/bmp/bmp-write.c
      - copied unchanged from r25196, /trunk/plug-ins/bmp/bmpwrite.c
   trunk/plug-ins/fits/fits-io.c
      - copied, changed from r25196, /trunk/plug-ins/fits/fitsrw.c
   trunk/plug-ins/fits/fits-io.h
      - copied unchanged from r25196, /trunk/plug-ins/fits/fitsrw.h
   trunk/plug-ins/sgi/sgi-lib.c
      - copied, changed from r25196, /trunk/plug-ins/sgi/sgilib.c
   trunk/plug-ins/sgi/sgi-lib.h
      - copied, changed from r25196, /trunk/plug-ins/sgi/sgi.h
Removed:
   trunk/plug-ins/bmp/bmpread.c
   trunk/plug-ins/bmp/bmpwrite.c
   trunk/plug-ins/fits/fitsrw.c
   trunk/plug-ins/fits/fitsrw.h
   trunk/plug-ins/sgi/sgi.h
   trunk/plug-ins/sgi/sgilib.c
Modified:
   trunk/ChangeLog
   trunk/plug-ins/bmp/Makefile.am
   trunk/plug-ins/fits/Makefile.am
   trunk/plug-ins/fits/fits.c
   trunk/plug-ins/sgi/Makefile.am
   trunk/plug-ins/sgi/sgi.c

Modified: trunk/plug-ins/bmp/Makefile.am
==============================================================================
--- trunk/plug-ins/bmp/Makefile.am	(original)
+++ trunk/plug-ins/bmp/Makefile.am	Mon Mar 24 22:07:14 2008
@@ -21,8 +21,8 @@
 bmp_SOURCES = \
 	bmp.c		\
 	bmp.h		\
-	bmpread.c	\
-	bmpwrite.c
+	bmp-read.c	\
+	bmp-write.c
 
 INCLUDES = \
 	-I$(top_srcdir)	\

Modified: trunk/plug-ins/fits/Makefile.am
==============================================================================
--- trunk/plug-ins/fits/Makefile.am	(original)
+++ trunk/plug-ins/fits/Makefile.am	Mon Mar 24 22:07:14 2008
@@ -20,8 +20,8 @@
 
 fits_SOURCES = \
 	fits.c		\
-	fitsrw.c	\
-	fitsrw.h
+	fits-io.c	\
+	fits-io.h
 
 INCLUDES = \
 	-I$(top_srcdir)	\

Copied: trunk/plug-ins/fits/fits-io.c (from r25196, /trunk/plug-ins/fits/fitsrw.c)
==============================================================================
--- /trunk/plug-ins/fits/fitsrw.c	(original)
+++ trunk/plug-ins/fits/fits-io.c	Mon Mar 24 22:07:14 2008
@@ -92,7 +92,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "fitsrw.h"
+#include "fits-io.h"
 
 
 /* Declaration of local funtions */

Modified: trunk/plug-ins/fits/fits.c
==============================================================================
--- trunk/plug-ins/fits/fits.c	(original)
+++ trunk/plug-ins/fits/fits.c	Mon Mar 24 22:07:14 2008
@@ -45,7 +45,7 @@
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
-#include "fitsrw.h"
+#include "fits-io.h"
 
 #include "libgimp/stdplugins-intl.h"
 

Modified: trunk/plug-ins/sgi/Makefile.am
==============================================================================
--- trunk/plug-ins/sgi/Makefile.am	(original)
+++ trunk/plug-ins/sgi/Makefile.am	Mon Mar 24 22:07:14 2008
@@ -19,9 +19,9 @@
 libexec_PROGRAMS = sgi
 
 sgi_SOURCES = \
-	sgi.c	\
-	sgi.h	\
-	sgilib.c
+	sgi.c		\
+	sgi-lib.c	\
+	sgi-lib.h
 
 INCLUDES = \
 	-I$(top_srcdir)	\

Copied: trunk/plug-ins/sgi/sgi-lib.c (from r25196, /trunk/plug-ins/sgi/sgilib.c)
==============================================================================
--- /trunk/plug-ins/sgi/sgilib.c	(original)
+++ trunk/plug-ins/sgi/sgi-lib.c	Mon Mar 24 22:07:14 2008
@@ -104,9 +104,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <glib.h>
 #include <glib/gstdio.h>
 
-#include "sgi.h"
+#include "sgi-lib.h"
 
 
 /*
@@ -929,8 +930,3 @@
   else
     return (2 * length);
 }
-
-
-/*
- * End of "$Id$".
- */

Copied: trunk/plug-ins/sgi/sgi-lib.h (from r25196, /trunk/plug-ins/sgi/sgi.h)
==============================================================================
--- /trunk/plug-ins/sgi/sgi.h	(original)
+++ trunk/plug-ins/sgi/sgi-lib.h	Mon Mar 24 22:07:14 2008
@@ -16,19 +16,12 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Revision History:
- *
- *   see ChangeLog
  */
 
-#ifndef _SGI_H_
-#  define _SGI_H_
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif
+#ifndef __SGI_LIB_H__
+#define __SGI_LIB_H__
 
+G_BEGIN_DECLS
 
 /*
  * Constants...
@@ -72,19 +65,30 @@
  * Prototypes...
  */
 
-extern int	sgiClose(sgi_t *sgip);
-extern int	sgiGetRow(sgi_t *sgip, unsigned short *row, int y, int z);
-extern sgi_t	*sgiOpen(char *filename, int mode, int comp, int bpp,
-		         int xsize, int ysize, int zsize);
-extern sgi_t	*sgiOpenFile(FILE *file, int mode, int comp, int bpp,
-		             int xsize, int ysize, int zsize);
-extern int	sgiPutRow(sgi_t *sgip, unsigned short *row, int y, int z);
-
-#  ifdef __cplusplus
-}
-#  endif
-#endif /* !_SGI_H_ */
+extern int	sgiClose     (sgi_t *sgip);
+extern int	sgiGetRow    (sgi_t *sgip,
+                              unsigned short *row,
+                              int y,
+                              int z);
+extern sgi_t	*sgiOpen     (char *filename,
+                              int mode,
+                              int comp,
+                              int bpp,
+                              int xsize,
+                              int ysize,
+                              int zsize);
+extern sgi_t	*sgiOpenFile (FILE *file,
+                              int mode,
+                              int comp,
+                              int bpp,
+                              int xsize,
+                              int ysize,
+                              int zsize);
+extern int	sgiPutRow    (sgi_t *sgip,
+                              unsigned short *row,
+                              int y,
+                              int z);
 
-/*
- * End of "$Id$".
- */
+G_END_DECLS
+
+#endif /* !__SGI_LIB_H__ */

Modified: trunk/plug-ins/sgi/sgi.c
==============================================================================
--- trunk/plug-ins/sgi/sgi.c	(original)
+++ trunk/plug-ins/sgi/sgi.c	Mon Mar 24 22:07:14 2008
@@ -36,7 +36,7 @@
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
-#include "sgi.h"                /* SGI image library definitions */
+#include "sgi-lib.h"
 
 #include "libgimp/stdplugins-intl.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]