Commit 1cd6fcc1 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

libgimp/.cvsignore libgimp/Makefile.am libgimp/gimp.h removed

2001-05-22  Michael Natterer  <mitch@gimp.org>

	* libgimp/.cvsignore
	* libgimp/Makefile.am
	* libgimp/gimp.h
	* libgimp/gimpfeatures.h.in: removed gimpfeatures.h

	* libgimpbase/.cvsignore
	* libgimpbase/Makefile.am
	* libgimpbase/gimpbase.h
	* libgimpbase/gimpbasetypes.h
	* libgimpbase/gimpversion.h.in: and added it as gimpversion.h

	* configure.in: changed accordingly.

	* app/app_procs.c
	* app/main.c
	* app/gui/about-dialog.c
	* app/gui/splash.c
	* app/pdb/misc_cmds.c
	* tools/pdbgen/pdb/misc.pdb: fixed includes.

	* plug-ins/bmp/bmpread.c
	* plug-ins/bmp/bmpwrite.c
	* plug-ins/common/gif.c
	* plug-ins/common/gifload.c
	* plug-ins/common/jpeg.c
	* plug-ins/common/newsprint.c
	* plug-ins/common/ps.c
	* plug-ins/common/tiff.c
	* plug-ins/gdyntext/gdyntextcompat.h
	* plug-ins/gimpressionist/gimpressionist.c
	* plug-ins/perl/Gimp.xs
	* plug-ins/perl/Gimp/Lib.xs
	* plug-ins/pygimp/gimpmodule.c
	* tools/gimp-remote.c: removed all #ifdef GIMP_HAVE_BLAH
	conditionals as they are broken anyway since we changed all
	plug-ins with perl scripts shortly before 1.2. Also, refering to
	intermediate unstable releases is evil.
parent dd4b03ec
2001-05-22 Michael Natterer <mitch@gimp.org>
* libgimp/.cvsignore
* libgimp/Makefile.am
* libgimp/gimp.h
* libgimp/gimpfeatures.h.in: removed gimpfeatures.h
* libgimpbase/.cvsignore
* libgimpbase/Makefile.am
* libgimpbase/gimpbase.h
* libgimpbase/gimpbasetypes.h
* libgimpbase/gimpversion.h.in: and added it as gimpversion.h
* configure.in: changed accordingly.
* app/app_procs.c
* app/main.c
* app/gui/about-dialog.c
* app/gui/splash.c
* app/pdb/misc_cmds.c
* tools/pdbgen/pdb/misc.pdb: fixed includes.
* plug-ins/bmp/bmpread.c
* plug-ins/bmp/bmpwrite.c
* plug-ins/common/gif.c
* plug-ins/common/gifload.c
* plug-ins/common/jpeg.c
* plug-ins/common/newsprint.c
* plug-ins/common/ps.c
* plug-ins/common/tiff.c
* plug-ins/gdyntext/gdyntextcompat.h
* plug-ins/gimpressionist/gimpressionist.c
* plug-ins/perl/Gimp.xs
* plug-ins/perl/Gimp/Lib.xs
* plug-ins/pygimp/gimpmodule.c
* tools/gimp-remote.c: removed all #ifdef GIMP_HAVE_BLAH
conditionals as they are broken anyway since we changed all
plug-ins with perl scripts shortly before 1.2. Also, refering to
intermediate unstable releases is evil.
2001-05-21 Michael Natterer <mitch@gimp.org>
* app/app_procs.c
......
......@@ -27,7 +27,6 @@
#include <gtk/gtk.h>
#include "libgimpbase/gimpbase.h"
#include "libgimp/gimpfeatures.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
......
......@@ -26,7 +26,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimp/gimpfeatures.h"
#include "libgimpmath/gimpmath.h"
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
......
......@@ -26,7 +26,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimp/gimpfeatures.h"
#include "libgimpmath/gimpmath.h"
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
......
......@@ -24,7 +24,6 @@
#include <gtk/gtk.h>
#include "libgimpbase/gimpbase.h"
#include "libgimp/gimpfeatures.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
......
......@@ -40,8 +40,6 @@
#include "libgimpbase/gimpbase.h"
#include "libgimp/gimpfeatures.h"
#include "apptypes.h"
#include "appenv.h"
......
......@@ -30,7 +30,7 @@
#include "app_procs.h"
#include "libgimp/gimpfeatures.h"
#include "libgimpbase/gimpbase.h"
static ProcRecord version_proc;
static ProcRecord quit_proc;
......
......@@ -781,9 +781,9 @@ gimptool-1.4
gimptool.1
gimp-remote.1
gimp.spec
libgimp/gimpfeatures.h
libgimp/Makefile
libgimp/makefile.mingw
libgimpbase/gimpversion.h
libgimpbase/Makefile
libgimpbase/makefile.mingw
libgimpcolor/Makefile
......
......@@ -6,4 +6,3 @@ _libs
.libs
.deps
*.la
gimpfeatures.h
......@@ -17,7 +17,6 @@ INCLUDES = \
-I$(includedir)
EXTRA_DIST = \
gimpfeatures.h.in \
makefile.mingw \
makefile.mingw.in \
makefile.msc \
......@@ -93,11 +92,6 @@ PDB_WRAPPERS_H = \
gimpundo_pdb.h \
gimpunit_pdb.h
# help `make' along by giving another name for the file, which it knows
# how to build
../libgimp/gimpfeatures.h: gimpfeatures.h
@:
libgimp_1_3_la_SOURCES = \
gimp.c \
gimp.h \
......@@ -153,7 +147,6 @@ gimpinclude_HEADERS = \
gimpchannel.h \
gimpdrawable.h \
gimpenums.h \
gimpfeatures.h \
gimpgradientselect.h \
gimpimage.h \
gimplayer.h \
......
......@@ -33,7 +33,6 @@
#include <libgimp/gimpchannel.h>
#include <libgimp/gimpdrawable.h>
#include <libgimp/gimpfeatures.h>
#include <libgimp/gimpgradientselect.h>
#include <libgimp/gimpimage.h>
#include <libgimp/gimplayer.h>
......
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* 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 2 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
* Library 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, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_FEATURES_H__
#define __GIMP_FEATURES_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GIMP_MAJOR_VERSION (@GIMP_MAJOR_VERSION@)
#define GIMP_MINOR_VERSION (@GIMP_MINOR_VERSION@)
#define GIMP_MICRO_VERSION (@GIMP_MICRO_VERSION@)
#define GIMP_VERSION "@GIMP_VERSION@"
#define GIMP_CHECK_VERSION(major, minor, micro) \
(GIMP_MAJOR_VERSION > (major) || \
(GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION > (minor)) || \
(GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION == (minor) && \
GIMP_MICRO_VERSION >= (micro)))
#define GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE 1-1-0
#define GIMP_HAVE_PARASITES 1-1-0
#define GIMP_HAVE_RESOLUTION_INFO 1-1-0
#define GIMP_HAVE_DESTROY_PARAMDEFS 1-1-0
#define GIMP_HAVE_FEATURES_1_1_5 1-1-5
#define GIMP_HAVE_DEFAULT_DISPLAY 1-1-5
#define GIMP_HAVE_PIXEL_RGNS_REGISTER2 1-1-5
#define GIMP_HAVE_NEW_ENUMS 1-1-10
#define GIMP_HAVE_EXPORT 1-1-10
#define GIMP_HAVE_SYSCONFDIR 1-1-28
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GIMP_FEATURES_H__ */
......@@ -6,3 +6,4 @@ _libs
.libs
.deps
*.la
gimpversion.h
......@@ -17,6 +17,7 @@ INCLUDES = \
-I$(includedir)
EXTRA_DIST = \
gimpversion.h.in \
makefile.mingw \
makefile.mingw.in \
makefile.msc \
......@@ -24,6 +25,11 @@ EXTRA_DIST = \
lib_LTLIBRARIES = libgimpbase-1.3.la
# help `make' along by giving another name for the file, which it knows
# how to build
../libgimpbase/gimpversion.h: gimpversion.h
@:
libgimpbase_1_3_la_SOURCES = \
gimpbase.h \
gimpbasetypes.h \
......@@ -41,6 +47,7 @@ libgimpbase_1_3_la_SOURCES = \
gimpprotocol.c \
gimpprotocol.h \
gimpunit.h \
gimpversion.h \
gimpwire.c \
gimpwire.h
......@@ -53,7 +60,8 @@ libgimpbaseinclude_HEADERS = \
gimputils.h \
gimpparasite.h \
gimpparasiteio.h \
gimpunit.h
gimpunit.h \
gimpversion.h
libgimpbase_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
......
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -28,6 +28,7 @@
#include <libgimpbase/gimpparasite.h>
#include <libgimpbase/gimpunit.h>
#include <libgimpbase/gimputils.h>
#include <libgimpbase/gimpversion.h>
#ifndef G_OS_WIN32
#include <libgimpbase/gimpsignal.h>
......
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* 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 2 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
*
* 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
......
......@@ -16,9 +16,9 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_FEATURES_H__
#define __GIMP_FEATURES_H__
#ifndef __GIMP_VERSION_H__
#define __GIMP_VERSION_H__
#ifdef __cplusplus
extern "C" {
......@@ -35,25 +35,9 @@ extern "C" {
(GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION == (minor) && \
GIMP_MICRO_VERSION >= (micro)))
#define GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE 1-1-0
#define GIMP_HAVE_PARASITES 1-1-0
#define GIMP_HAVE_RESOLUTION_INFO 1-1-0
#define GIMP_HAVE_DESTROY_PARAMDEFS 1-1-0
#define GIMP_HAVE_FEATURES_1_1_5 1-1-5
#define GIMP_HAVE_DEFAULT_DISPLAY 1-1-5
#define GIMP_HAVE_PIXEL_RGNS_REGISTER2 1-1-5
#define GIMP_HAVE_NEW_ENUMS 1-1-10
#define GIMP_HAVE_EXPORT 1-1-10
#define GIMP_HAVE_SYSCONFDIR 1-1-28
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GIMP_FEATURES_H__ */
#endif /* __GIMP_VERSION_H__ */
......@@ -239,24 +239,22 @@ ReadBMP (gchar *name)
rowbytes,
Grey);
#ifdef GIMP_HAVE_RESOLUTION_INFO
if (Bitmap_Head.biXPels > 0 && Bitmap_Head.biYPels > 0)
{
/* Fixed up from scott@asofyet's changes last year, njl195 */
gdouble xresolution;
gdouble yresolution;
{
/* Fixed up from scott@asofyet's changes last year, njl195 */
gdouble xresolution;
gdouble yresolution;
/* I don't agree with scott's feeling that Gimp should be
* trying to "fix" metric resolution translations, in the
* long term Gimp should be SI (metric) anyway, but we
* haven't told the Americans that yet */
/* I don't agree with scott's feeling that Gimp should be
* trying to "fix" metric resolution translations, in the
* long term Gimp should be SI (metric) anyway, but we
* haven't told the Americans that yet */
xresolution = Bitmap_Head.biXPels * 0.0254;
yresolution = Bitmap_Head.biYPels * 0.0254;
xresolution = Bitmap_Head.biXPels * 0.0254;
yresolution = Bitmap_Head.biYPels * 0.0254;
gimp_image_set_resolution (image_ID, xresolution, yresolution);
}
#endif /* GIMP_HAVE_RESOLUTION_INFO */
gimp_image_set_resolution (image_ID, xresolution, yresolution);
}
return (image_ID);
}
......
......@@ -221,7 +221,6 @@ WriteBMP (gchar *filename,
Bitmap_Head.biSizeIm = SpZeile * rows;
#ifdef GIMP_HAVE_RESOLUTION_INFO
{
gdouble xresolution;
gdouble yresolution;
......@@ -243,10 +242,7 @@ WriteBMP (gchar *filename,
Bitmap_Head.biYPels = (long int) yresolution * 100.0 / 2.54;
}
}
#else /* GIMP_HAVE_RESOLUTION_INFO */
Bitmap_Head.biXPels = 1;
Bitmap_Head.biYPels = 1;
#endif /* GIMP_HAVE_RESOLUTION_INFO */
if (BitsPerPixel < 24)
Bitmap_Head.biClrUsed = colors;
else
......
......@@ -281,9 +281,7 @@
/* Does the version of GIMP we're compiling for support
data attachments to images? ('Parasites') */
#ifdef GIMP_HAVE_PARASITES
#define FACEHUGGERS aieee
#endif
/* PS: I know that technically facehuggers aren't parasites,
the pupal-forms are. But facehuggers are ky00te. */
......
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