Commit 1fd1919f authored by Manish Singh's avatar Manish Singh
Browse files

added a G_PI_2

* app/appenv.h: added a G_PI_2

* app/brush_header.h
* app/pattern_header.h: prefixed each FILE_VERSION with
G{BRUSH,PATTERN} to avoid namespace collision

* app/patterns.c: reflect above change

* app/iscissors.[ch]: merged in Austin's iscissors rewrite.. still
unfinished, but it's not like the old one did anything useful
anyway ;)

-Yosh
parent acdd8c09
Sun Aug 15 20:42:04 PDT 1999 Manish Singh <yosh@gimp.org>
* app/appenv.h: added a G_PI_2
* app/brush_header.h
* app/pattern_header.h: prefixed each FILE_VERSION with
G{BRUSH,PATTERN} to avoid namespace collision
* app/patterns.c: reflect above change
* app/iscissors.[ch]: merged in Austin's iscissors rewrite.. still
unfinished, but it's not like the old one did anything useful
anyway ;)
Sun Aug 15 23:10:21 MEST 1999 Sven Neumann <sven@gimp.org>
* app/measure.c: sqeezed out the last bugs out of the current
......
......@@ -43,7 +43,10 @@
#define MAXIMUM(x,y) MAX(x,y)
#ifndef G_PI /* G_PI will be in GLib eventually */
#define G_PI 3.14159265358979323846
#define G_PI 3.14159265358979323846
#endif
#ifndef G_PI_2 /* As will G_PI_2 */
#define G_PI_2 1.57079632679489661923
#endif
#ifndef G_PI_4 /* As will G_PI_4 */
#define G_PI_4 0.78539816339744830962
......
......@@ -20,8 +20,8 @@
typedef struct _BrushHeader BrushHeader;
#define FILE_VERSION 2
#define GBRUSH_MAGIC (('G' << 24) + ('I' << 16) + ('M' << 8) + ('P' << 0))
#define GBRUSH_FILE_VERSION 2
#define GBRUSH_MAGIC (('G' << 24) + ('I' << 16) + ('M' << 8) + ('P' << 0))
#define sz_BrushHeader (sizeof (BrushHeader))
/* All field entries are MSB */
......
......@@ -20,8 +20,8 @@
typedef struct _BrushHeader BrushHeader;
#define FILE_VERSION 2
#define GBRUSH_MAGIC (('G' << 24) + ('I' << 16) + ('M' << 8) + ('P' << 0))
#define GBRUSH_FILE_VERSION 2
#define GBRUSH_MAGIC (('G' << 24) + ('I' << 16) + ('M' << 8) + ('P' << 0))
#define sz_BrushHeader (sizeof (BrushHeader))
/* All field entries are MSB */
......
......@@ -20,8 +20,8 @@
typedef struct _PatternHeader PatternHeader;
#define FILE_VERSION 1
#define GPATTERN_MAGIC (('G' << 24) + ('P' << 16) + ('A' << 8) + ('T' << 0))
#define GPATTERN_FILE_VERSION 1
#define GPATTERN_MAGIC (('G' << 24) + ('P' << 16) + ('A' << 8) + ('T' << 0))
#define sz_PatternHeader (sizeof (PatternHeader))
/* All field entries are MSB */
......
......@@ -20,8 +20,8 @@
typedef struct _BrushHeader BrushHeader;
#define FILE_VERSION 2
#define GBRUSH_MAGIC (('G' << 24) + ('I' << 16) + ('M' << 8) + ('P' << 0))
#define GBRUSH_FILE_VERSION 2
#define GBRUSH_MAGIC (('G' << 24) + ('I' << 16) + ('M' << 8) + ('P' << 0))
#define sz_BrushHeader (sizeof (BrushHeader))
/* All field entries are MSB */
......
......@@ -20,8 +20,8 @@
typedef struct _PatternHeader PatternHeader;
#define FILE_VERSION 1
#define GPATTERN_MAGIC (('G' << 24) + ('P' << 16) + ('A' << 8) + ('T' << 0))
#define GPATTERN_FILE_VERSION 1
#define GPATTERN_MAGIC (('G' << 24) + ('P' << 16) + ('A' << 8) + ('T' << 0))
#define sz_PatternHeader (sizeof (PatternHeader))
/* All field entries are MSB */
......
This diff is collapsed.
......@@ -18,7 +18,6 @@
#ifndef __ISCISSORS_H__
#define __ISCISSORS_H__
void iscissors_dialog (void);
Tool * tools_new_iscissors (void);
void tools_free_iscissors (Tool *);
......
......@@ -20,8 +20,8 @@
typedef struct _PatternHeader PatternHeader;
#define FILE_VERSION 1
#define GPATTERN_MAGIC (('G' << 24) + ('P' << 16) + ('A' << 8) + ('T' << 0))
#define GPATTERN_FILE_VERSION 1
#define GPATTERN_MAGIC (('G' << 24) + ('P' << 16) + ('A' << 8) + ('T' << 0))
#define sz_PatternHeader (sizeof (PatternHeader))
/* All field entries are MSB */
......
......@@ -209,7 +209,7 @@ load_pattern (gchar *filename)
}
}
/* Check for correct version */
if (header.version != FILE_VERSION)
if (header.version != GPATTERN_FILE_VERSION)
{
g_message (_("Unknown GIMP version #%d in \"%s\"\n"), header.version,
filename);
......
This diff is collapsed.
......@@ -18,7 +18,6 @@
#ifndef __ISCISSORS_H__
#define __ISCISSORS_H__
void iscissors_dialog (void);
Tool * tools_new_iscissors (void);
void tools_free_iscissors (Tool *);
......
This diff is collapsed.
......@@ -18,7 +18,6 @@
#ifndef __ISCISSORS_H__
#define __ISCISSORS_H__
void iscissors_dialog (void);
Tool * tools_new_iscissors (void);
void tools_free_iscissors (Tool *);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment