Commit 270c0336 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Merged the gz and bz2 plug-ins into one generic compression handler that

2004-10-07  Michael Natterer  <mitch@gimp.org>

	Merged the gz and bz2 plug-ins into one generic compression
	handler that can be extended by adding entries to a table of
	compressor definitions:

	* configure.in: removed bz2 special casing for win32.

	* plug-ins/common/bz2.c
	* plug-ins/common/gz.c: removed.

	* plug-ins/common/compressor.c: new plug-in.

	* plug-ins/common/plugin-defs.pl: changed accordingly.

	* plug-ins/common/.cvsignore
	* plug-ins/common/Makefile.am: regenerated.
parent 236cd655
2004-10-07 Michael Natterer <mitch@gimp.org>
Merged the gz and bz2 plug-ins into one generic compression
handler that can be extended by adding entries to a table of
compressor definitions:
* configure.in: removed bz2 special casing for win32.
* plug-ins/common/bz2.c
* plug-ins/common/gz.c: removed.
* plug-ins/common/compressor.c: new plug-in.
* plug-ins/common/plugin-defs.pl: changed accordingly.
* plug-ins/common/.cvsignore
* plug-ins/common/Makefile.am: regenerated.
2004-10-07 Simon Budig <simon@gimp.org>
* app/actions/view-commands.c: fill in the formula... :-)
......
......@@ -1314,13 +1314,11 @@ if test x"$os_win32" = xyes; then
WINCLIPBOARD='winclipboard$(EXEEXT)'
WINPRINT='winprint$(EXEEXT)'
else
BZ2='bz2$(EXEEXT)'
MAIL='mail$(EXEEXT)'
SCREENSHOT='screenshot$(EXEEXT)'
URL='url$(EXEEXT)'
fi
AC_SUBST(BZ2)
AC_SUBST(MAIL)
AC_SUBST(SCREENSHOT)
AC_SUBST(URL)
......
......@@ -16,7 +16,6 @@ blinds
blur
borderaverage
bumpmap
bz2
c_astretch
cartoon
ccanalyze
......@@ -26,6 +25,7 @@ color_enhance
colorify
colortoalpha
compose
compressor
convmatrix
csource
cubism
......@@ -60,7 +60,6 @@ gradmap
grid
gtm
guillotine
gz
header
hot
illusion
......
......@@ -41,7 +41,6 @@ libexec_PROGRAMS = \
blur \
borderaverage \
bumpmap \
$(BZ2) \
c_astretch \
cartoon \
ccanalyze \
......@@ -51,6 +50,7 @@ libexec_PROGRAMS = \
colorify \
colortoalpha \
compose \
compressor \
convmatrix \
csource \
cubism \
......@@ -85,7 +85,6 @@ libexec_PROGRAMS = \
grid \
gtm \
guillotine \
gz \
header \
hot \
illusion \
......@@ -169,7 +168,6 @@ libexec_PROGRAMS = \
EXTRA_PROGRAMS = \
aa \
bz2 \
jpeg \
mail \
mng \
......@@ -371,18 +369,6 @@ bumpmap_LDADD = \
$(RT_LIBS) \
$(INTLLIBS)
bz2_SOURCES = \
bz2.c
bz2_LDADD = \
$(libgimp) \
$(libgimpcolor) \
$(libgimpbase) \
$(LIBBZ2) \
$(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
c_astretch_SOURCES = \
c_astretch.c
......@@ -498,6 +484,17 @@ compose_LDADD = \
$(RT_LIBS) \
$(INTLLIBS)
compressor_SOURCES = \
compressor.c
compressor_LDADD = \
$(libgimp) \
$(libgimpcolor) \
$(libgimpbase) \
$(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
convmatrix_SOURCES = \
convmatrix.c
......@@ -934,17 +931,6 @@ guillotine_LDADD = \
$(RT_LIBS) \
$(INTLLIBS)
gz_SOURCES = \
gz.c
gz_LDADD = \
$(libgimp) \
$(libgimpcolor) \
$(libgimpbase) \
$(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
header_SOURCES = \
header.c
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
* Copyright (C) 1997 Daniel Risacher
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* 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.
*/
/* bzip2 plug-in for the gimp */
/* this is almost exactly the same as the gz(ip) plugin by */
/* Dan Risacher & Josh, so feel free to go look there. */
/* GZ plugin adapted to BZ2 by Adam. I've left all other */
/* Error checking added by srn. */
/* credits intact since it was only a super-wussy mod. */
/* This is reads and writes bzip2ed image files for the Gimp
*
* You need to have bzip2 installed for it to work.
*
* It should work with file names of the form
* filename.foo.bz2 where foo is some already-recognized extension
*/
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <libgimp/gimp.h>
#include "libgimp/stdplugins-intl.h"
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static gint32 load_image (const gchar *filename,
gint32 run_mode,
GimpPDBStatusType *status /* return value */);
static GimpPDBStatusType save_image (const gchar *filename,
gint32 image_ID,
gint32 drawable_ID,
gint32 run_mode);
static gboolean valid_file (const gchar *filename);
static const gchar * find_extension (const gchar *filename);
GimpPlugInInfo PLUG_IN_INFO =
{
NULL, /* init_proc */
NULL, /* quit_proc */
query, /* query_proc */
run, /* run_proc */
};
MAIN ()
static void
query (void)
{
static GimpParamDef load_args[] =
{
{ GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" },
{ GIMP_PDB_STRING, "filename", "The name of the file to load" },
{ GIMP_PDB_STRING, "raw_filename", "The name entered" }
};
static GimpParamDef load_return_vals[] =
{
{ GIMP_PDB_IMAGE, "image", "Output image" }
};
static GimpParamDef save_args[] =
{
{ GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" },
{ GIMP_PDB_IMAGE, "image", "Input image" },
{ GIMP_PDB_DRAWABLE, "drawable", "Drawable to save" },
{ GIMP_PDB_STRING, "filename", "The name of the file to save the image in" },
{ GIMP_PDB_STRING, "raw_filename", "The name of the file to save the image in" }
};
gimp_install_procedure ("file_bz2_load",
"loads files compressed with bzip2",
"You need to have bzip2 installed.",
"Daniel Risacher",
"Daniel Risacher, Spencer Kimball and Peter Mattis",
"1995-1997",
N_("bzip archive"),
NULL,
GIMP_PLUGIN,
G_N_ELEMENTS (load_args),
G_N_ELEMENTS (load_return_vals),
load_args, load_return_vals);
gimp_plugin_menu_register ("file_bz2_load", "<Load>");
gimp_register_file_handler_mime ("file_bz2_load", "application/x-bzip");
gimp_register_magic_load_handler ("file_bz2_load",
"bz2,xcfbz2",
"",
"0,string,BZh");
gimp_install_procedure ("file_bz2_save",
"saves files compressed with bzip2",
"You need to have bzip2 installed",
"Daniel Risacher",
"Daniel Risacher, Spencer Kimball and Peter Mattis",
"1995-1997",
N_("bzip archive"),
"RGB*, GRAY*, INDEXED*",
GIMP_PLUGIN,
G_N_ELEMENTS (save_args), 0,
save_args, NULL);
gimp_register_file_handler_mime ("file_bz2_save", "application/x-bzip");
gimp_register_save_handler ("file_bz2_save",
"bz2,xcfbz2",
"");
}
static void
run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[2];
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
gint32 image_ID;
run_mode = param[0].data.d_int32;
INIT_I18N();
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;
if (strcmp (name, "file_bz2_load") == 0)
{
image_ID = load_image (param[1].data.d_string,
param[0].data.d_int32,
&status);
if (image_ID != -1 &&
status == GIMP_PDB_SUCCESS)
{
*nreturn_vals = 2;
values[1].type = GIMP_PDB_IMAGE;
values[1].data.d_image = image_ID;
}
}
else if (strcmp (name, "file_bz2_save") == 0)
{
switch (run_mode)
{
case GIMP_RUN_INTERACTIVE:
break;
case GIMP_RUN_NONINTERACTIVE:
/* Make sure all the arguments are there! */
if (nparams != 4)
status = GIMP_PDB_CALLING_ERROR;
break;
case GIMP_RUN_WITH_LAST_VALS:
break;
default:
break;
}
if (status == GIMP_PDB_SUCCESS)
{
status = save_image (param[3].data.d_string,
param[1].data.d_int32,
param[2].data.d_int32,
param[0].data.d_int32);
}
}
else
{
status = GIMP_PDB_CALLING_ERROR;
}
values[0].data.d_status = status;
}
static GimpPDBStatusType
save_image (const gchar *filename,
gint32 image_ID,
gint32 drawable_ID,
gint32 run_mode)
{
FILE *f;
const gchar *ext;
gchar *tmpname;
gint pid;
gint wpid;
gint process_status;
if (NULL == (ext = find_extension (filename)))
{
g_message (_("No sensible extension, saving as compressed XCF."));
ext = ".xcf";
}
/* get a temp name with the right extension and save into it. */
tmpname = gimp_temp_name (ext + 1);
if (! (gimp_file_save (run_mode,
image_ID,
drawable_ID,
tmpname,
tmpname) && valid_file (tmpname)) )
{
unlink (tmpname);
g_free (tmpname);
return GIMP_PDB_EXECUTION_ERROR;
}
/* fork off a bzip2 process */
if ((pid = fork ()) < 0)
{
g_message ("fork() failed: %s", g_strerror (errno));
g_free (tmpname);
return GIMP_PDB_EXECUTION_ERROR;
}
else if (pid == 0)
{
if (!(f = fopen (filename, "w")))
{
g_message (_("Could not open '%s' for writing: %s"),
gimp_filename_to_utf8 (filename), g_strerror (errno));
g_free (tmpname);
_exit(127);
}
/* make stdout for this process be the output file */
if (-1 == dup2 (fileno (f), fileno (stdout)))
g_message ("dup2() failed: %s", g_strerror (errno));
/* and bzip2 into it */
execlp ("bzip2", "bzip2", "-cf", tmpname, NULL);
g_message ("execlp(\"bzip2 -cf\") failed: %s", g_strerror (errno));
g_free (tmpname);
_exit (127);
}
else
{
wpid = waitpid (pid, &process_status, 0);
if ((wpid < 0)
|| !WIFEXITED (process_status)
|| (WEXITSTATUS (process_status) != 0))
{
g_message ("bzip2 exited abnormally on file '%s'",
gimp_filename_to_utf8 (tmpname));
g_free (tmpname);
return GIMP_PDB_EXECUTION_ERROR;
}
}
unlink (tmpname);
g_free (tmpname);
return GIMP_PDB_SUCCESS;
}
static gint32
load_image (const gchar *filename,
gint32 run_mode,
GimpPDBStatusType *status /* return value */)
{
gint32 image_ID;
const gchar *ext;
gchar *tmpname;
gint pid;
gint wpid;
gint process_status;
if (NULL == (ext = find_extension (filename)))
{
g_message (_("No sensible extension, attempting to load "
"with file magic."));
ext = ".foo";
}
/* find a temp name */
tmpname = gimp_temp_name (ext + 1);
/* fork off a bzip2 and wait for it */
if ((pid = fork ()) < 0)
{
g_message ("fork() failed: %s", g_strerror (errno));
g_free (tmpname);
*status = GIMP_PDB_EXECUTION_ERROR;
return -1;
}
else if (pid == 0) /* child process */
{
FILE *f;
if (!(f = fopen (tmpname,"w")))
{
g_message (_("Could not open '%s' for writing: %s"),
gimp_filename_to_utf8 (tmpname), g_strerror (errno));
g_free (tmpname);
_exit (127);
}
/* make stdout for this child process be the temp file */
if (-1 == dup2 (fileno (f), fileno (stdout)))
g_message ("dup2() failed: %s", g_strerror (errno));
/* and unzip into it */
execlp ("bzip2", "bzip2", "-cfd", filename, NULL);
g_message ("execlp(\"bzip2 -cfd\") failed: %s", g_strerror (errno));
g_free (tmpname);
_exit (127);
}
else /* parent process */
{
wpid = waitpid (pid, &process_status, 0);
if ((wpid < 0)
|| !WIFEXITED (process_status)
|| (WEXITSTATUS (process_status) != 0))
{
g_message ("bzip2 exited abnormally on file '%s'",
gimp_filename_to_utf8 (filename));
g_free (tmpname);
*status = GIMP_PDB_EXECUTION_ERROR;
return -1;
}
}
/* now that we un-bzip2ed it, load the temp file */
image_ID = gimp_file_load (run_mode, tmpname, tmpname);
unlink (tmpname);
g_free (tmpname);
if (image_ID != -1)
{
*status = GIMP_PDB_SUCCESS;
gimp_image_set_filename (image_ID, filename);
}
else
*status = GIMP_PDB_EXECUTION_ERROR;
return image_ID;
}
static gboolean
valid_file (const gchar* filename)
{
gint stat_res;
struct stat buf;
stat_res = stat (filename, &buf);
return 0 == stat_res && buf.st_size > 0;
}
static const gchar *
find_extension (const gchar* filename)
{
gchar *filename_copy;
gchar *ext;
/* we never free this copy - aren't we evil! */
filename_copy = g_strdup (filename);
/* find the extension, boy! */
ext = strrchr (filename_copy, '.');
while (TRUE)
{
if (!ext || ext[1] == '\0' || strchr (ext, '/'))
{
return NULL;
}
if (0 == g_ascii_strcasecmp (ext, ".xcfbz2"))
{
return ".xcf"; /* we've found it */
}
if (0 != g_ascii_strcasecmp (ext, ".bz2"))
{
return ext;
}
else
{
/* we found ".bz2" so strip it, loop back, and look again */
*ext = '\0';
ext = strrchr (filename_copy, '.');
}
}
}
This diff is collapsed.
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
* Copyright (C) 1997 Daniel Risacher, magnus@alum.mit.edu
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* 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.
*/
/* Minor changes to support file magic */
/* 4 Oct 1997 -- Risacher */
/* gzip plug-in for the gimp */
/* loosley based on url.c by */
/* Josh MacDonald, jmacd@cs.berkeley.edu */
/* and, very loosely on hrz.c by */
/* Albert Cahalan <acahalan at cs.uml.edu> */
/* This is reads and writes gziped image files for the Gimp
*
* You need to have gzip installed for it to work.
*
* It should work with file names of the form
* filename.foo.gz where foo is some already-recognized extension
*
* and it also works for names of the form
* filename.xcfgz - which is equivalent to
* filename.xcf.gz
*
* I added the xcfgz bit because having a default extension of xcf.gz
* can confuse the file selection dialog box somewhat, forcing the
* user to type sometimes when he/she otherwise wouldn't need to.
*
* I later decided I didn't like it because I don't like to bloat
* the file-extension namespace. But I left in the recognition
* feature/bug so if people want to use files named foo.xcfgz by
* default, they can just hack their pluginrc file.
*
* to do this hack, change :
* "xcf.gz,gz,xcfgz"
* to
* "xcfgz,gz,xcf.gz"
*
*
* -Dan Risacher, 0430 CDT, 26 May 1997
*/
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#include <sys/stat.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <errno.h>
#include <libgimp/gimp.h>
#ifdef G_OS_WIN32
#define STRICT
#define WinMain WinMain_foo
#include <windows.h>
#include <io.h> /* _get_osfhandle */
#undef WinMain
#endif
#include "libgimp/stdplugins-intl.h"
/* Author 1: Josh MacDonald (url.c) */
/* Author 2: Daniel Risacher (gz.c) */
/* According to USAF Lt Steve Werhle, US DoD software development
* contracts average about $25 USD per source line of code (SLOC). By
* that metric, I figure this plug-in is worth about $10,000 USD */
/* But you got it free. Magic of Gnu. */
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static gint32 load_image (const gchar *filename,
gint32 run_mode,
GimpPDBStatusType *status /* return value */);
static GimpPDBStatusType save_image (const gchar *filename,
gint32 image_ID,
gint32 drawable_ID,
gint32 run_mode);
static gboolean valid_file (const gchar *filename);
static const gchar * find_extension (const gchar *filename);
GimpPlugInInfo PLUG_IN_INFO =
{
NULL, /* init_proc */
NULL, /* quit_proc */
query, /* query_proc */
run, /* run_proc */
};
MAIN ()
static void
query (void)
{
static GimpParamDef load_args[] =
{
{ GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" },
{ GIMP_PDB_STRING, "filename", "The name of the file to load" },
{ GIMP_PDB_STRING, "raw_filename", "The name entered" }
};
static GimpParamDef load_return_vals[] =
{
{ GIMP_PDB_IMAGE, "image", "Output image" },
};
static GimpParamDef save_args[] =
{
{ GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" },
{ GIMP_PDB_IMAGE, "image", "Input image" },
{ GIMP_PDB_DRAWABLE, "drawable", "Drawable to save" },
{ GIMP_PDB_STRING, "filename", "The name of the file to save the image in" },
{ GIMP_PDB_STRING, "raw_filename", "The name of the file to save the image in" }
};
gimp_install_procedure ("file_gz_load",
"loads files compressed with gzip",
"You need to have gzip installed.",
"Daniel Risacher",
"Daniel Risacher, Spencer Kimball and Peter Mattis",
"1995-1997",
N_("gzip archive"),
NULL,
GIMP_PLUGIN,
G_N_ELEMENTS (load_args),
G_N_ELEMENTS (load_return_vals),
load_args, load_return_vals);
gimp_plugin_menu_register ("file_gz_load", "<Load>");
gimp_register_file_handler_mime ("file_gz_load", "application/x-gzip");
gimp_register_magic_load_handler ("file_gz_load",
"gz,xcfgz",
"",
"0,string,\037\213");
gimp_install_procedure ("file_gz_save",
"saves files compressed with gzip",
"You need to have gzip installed.",
"Daniel Risacher",
"Daniel Risacher, Spencer Kimball and Peter Mattis",
"1995-1997",
N_("gzip archive"),
"RGB*, GRAY*, INDEXED*",
GIMP_PLUGIN,
G_N_ELEMENTS (save_args), 0,
save_args, NULL);
gimp_register_file_handler_mime ("file_gz_save", "application/x-gzip");
gimp_register_save_handler ("file_gz_save",
"gz,xcfgz",
"");
}
static void
run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)