diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:32:13 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:32:13 +0000 |
commit | 51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800 (patch) | |
tree | 3b763ebf105fc1136ebcac13b7d4dafca114be68 /converter/other/fiasco | |
parent | 1610a1f6aa54ad1d97926c1d8605720933059df7 (diff) | |
download | netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.tar.gz netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.tar.xz netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.zip |
Reverse messed up commit
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2222 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/fiasco')
-rw-r--r-- | converter/other/fiasco/Makefile | 16 | ||||
-rw-r--r-- | converter/other/fiasco/codec/ip.c | 4 | ||||
-rw-r--r-- | converter/other/fiasco/codec/tiling.c | 2 | ||||
-rw-r--r-- | converter/other/fiasco/codec/wfa.h | 2 | ||||
-rw-r--r-- | converter/other/fiasco/display.c | 3 | ||||
-rw-r--r-- | converter/other/fiasco/lib/image.c | 2 | ||||
-rw-r--r-- | converter/other/fiasco/params.c | 2 | ||||
-rw-r--r-- | converter/other/fiasco/pnmtofiasco.c | 2 |
8 files changed, 17 insertions, 16 deletions
diff --git a/converter/other/fiasco/Makefile b/converter/other/fiasco/Makefile index 392e843c..16221d77 100644 --- a/converter/other/fiasco/Makefile +++ b/converter/other/fiasco/Makefile @@ -11,9 +11,8 @@ COMP_INCLUDES = \ -I$(SRCDIR)/$(SUBDIR)/codec -I$(SRCDIR)/$(SUBDIR)/input \ -I$(SRCDIR)/$(SUBDIR)/output -I$(SRCDIR)/$(SUBDIR)/lib \ -PORTBINARIES = pnmtofiasco fiascotopnm +BINARIES = pnmtofiasco fiascotopnm -BINARIES = $(PORTBINARIES) MERGEBINARIES = $(BINARIES) SCRIPTS = @@ -25,18 +24,21 @@ FIASCOLIBS = codec/libfiasco_codec.a \ output/libfiasco_output.a \ lib/libfiasco_lib.a -ADDL_OBJECTS = binerror.o getopt.o getopt1.o params.o +COMMON_OBJECTS = binerror.o getopt.o getopt1.o params.o -OBJECTS = $(BINARIES:%=%.o) $(ADDL_OBJECTS) +OBJECTS = $(BINARIES:%=%.o) $(COMMON_OBJECTS) -MERGE_OBJECTS = $(BINARIES:%=%.o2) $(ADDL_OBJECTS) $(FIASCOLIBS) +MERGE_OBJECTS = $(BINARIES:%=%.o2) $(COMMON_OBJECTS) $(FIASCOLIBS) SUBDIRS = codec input output lib include $(SRCDIR)/common.mk -$(BINARIES):%:%.o $(ADDL_OBJECTS) $(FIASCOLIBS) -$(BINARIES): LDFLAGS_TARGET = $(shell $(LIBOPT) $(FIASCOLIBS)) +$(BINARIES):%:%.o $(COMMON_OBJECTS) $(FIASCOLIBS) $(NETPBMLIB) \ + $(LIBOPT) + $(LD) -o $@ $< $(COMMON_OBJECTS) \ + $(shell $(LIBOPT) $(FIASCOLIBS) $(NETPBMLIB)) $(MATHLIB) \ + $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) codec/libfiasco_codec.a: $(BUILDDIR)/$(SUBDIR)/codec FORCE $(MAKE) -C codec -f $(SRCDIR)/$(SUBDIR)/codec/Makefile \ diff --git a/converter/other/fiasco/codec/ip.c b/converter/other/fiasco/codec/ip.c index ade0d916..caa97baf 100644 --- a/converter/other/fiasco/codec/ip.c +++ b/converter/other/fiasco/codec/ip.c @@ -282,7 +282,7 @@ standard_ip_image_state (unsigned address, unsigned level, unsigned domain, real_t ip = 0, *imageptr, *stateptr; if (level > c->options.images_level) - error ("We cannot interpret a Level %d image.", level); + error ("Level %d not supported.", level); imageptr = &c->pixels [address * size_of_level (level)]; @@ -311,7 +311,7 @@ standard_ip_state_state (unsigned domain1, unsigned domain2, unsigned level, real_t ip = 0, *state1ptr, *state2ptr; if (level > c->options.images_level) - error ("We cannot interpret and image with Level %d.", level); + error ("Level %d not supported.", level); state1ptr = c->images_of_state [domain1] + address_of_level (level); state2ptr = c->images_of_state [domain2] + address_of_level (level); diff --git a/converter/other/fiasco/codec/tiling.c b/converter/other/fiasco/codec/tiling.c index 21e4428a..89fe3111 100644 --- a/converter/other/fiasco/codec/tiling.c +++ b/converter/other/fiasco/codec/tiling.c @@ -224,7 +224,7 @@ perform_tiling (const image_t *image, tiling_t *tiling) } else { - warning ("We do not know the tiling method.\n" + warning ("Unsupported image tiling method.\n" "Skipping image tiling step."); tiling->exponent = 0; } diff --git a/converter/other/fiasco/codec/wfa.h b/converter/other/fiasco/codec/wfa.h index 9253affd..0b96ba8c 100644 --- a/converter/other/fiasco/codec/wfa.h +++ b/converter/other/fiasco/codec/wfa.h @@ -19,7 +19,7 @@ #define MAXEDGES 5 #define MAXSTATES 6000 -#define MAXLABELS 2 /* only bintree possible anymore */ +#define MAXLABELS 2 /* only bintree supported anymore */ #define MAXLEVEL 22 #define FIASCO_BINFILE_RELEASE 2 diff --git a/converter/other/fiasco/display.c b/converter/other/fiasco/display.c index cf160329..368fd3c9 100644 --- a/converter/other/fiasco/display.c +++ b/converter/other/fiasco/display.c @@ -307,8 +307,7 @@ alloc_ximage (x11_info_t *xinfo, unsigned width, unsigned height) shmem_flag = 0; if (fiasco_get_verbosity ()) fprintf (stderr, - "Shared memory does not work on this system\n" - "Reverting to normal Xlib.\n"); + "Shared memory not supported\nReverting to normal Xlib.\n"); } if (shmem_flag) diff --git a/converter/other/fiasco/lib/image.c b/converter/other/fiasco/lib/image.c index fa3b2db5..56275f2e 100644 --- a/converter/other/fiasco/lib/image.c +++ b/converter/other/fiasco/lib/image.c @@ -449,7 +449,7 @@ write_image (const char *image_name, const image_t *image) if (image->format == FORMAT_4_2_0) { - warning ("We cannot write images in 4:2:0 format."); + warning ("Writing of images in 4:2:0 format not supported."); return; } diff --git a/converter/other/fiasco/params.c b/converter/other/fiasco/params.c index afacbada..a4d843a8 100644 --- a/converter/other/fiasco/params.c +++ b/converter/other/fiasco/params.c @@ -656,7 +656,7 @@ usage (const param_t *params, const char *progname, const char *synopsis, fprintf (stderr, "Usage: %s [OPTION]...%s\n", progname, non_opt_string ? non_opt_string : " "); if (synopsis != NULL) - fprintf (stderr, "%s", synopsis); + fprintf (stderr, synopsis); fprintf (stderr, "\n\n"); fprintf (stderr, "Mandatory or optional arguments to long options " "are mandatory or optional\nfor short options too. " diff --git a/converter/other/fiasco/pnmtofiasco.c b/converter/other/fiasco/pnmtofiasco.c index eebd09a9..d78ff6b1 100644 --- a/converter/other/fiasco/pnmtofiasco.c +++ b/converter/other/fiasco/pnmtofiasco.c @@ -170,7 +170,7 @@ main (int argc, char **argv) return 0; else { - fprintf (stderr, "%s", fiasco_get_error_message ()); + fprintf (stderr, fiasco_get_error_message ()); fprintf (stderr, "\n"); return 1; } |