diff options
Diffstat (limited to 'converter/other/pamtosvg')
| -rw-r--r-- | converter/other/pamtosvg/Makefile | 32 | ||||
| -rw-r--r-- | converter/other/pamtosvg/bitmap.h | 2 | ||||
| -rw-r--r-- | converter/other/pamtosvg/image-proc.c | 2 | ||||
| -rw-r--r-- | converter/other/pamtosvg/thin-image.c | 2 |
4 files changed, 27 insertions, 11 deletions
diff --git a/converter/other/pamtosvg/Makefile b/converter/other/pamtosvg/Makefile index 83f150d0..8b033020 100644 --- a/converter/other/pamtosvg/Makefile +++ b/converter/other/pamtosvg/Makefile @@ -7,13 +7,26 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/config.mk -PORTBINARIES = pamtosvg +BINARIES = pamtosvg -BINARIES = $(PORTBINARIES) - -MERGEBINARIES = $(BINARIES) +PAMTOSVG_OBJECTS = \ + pamtosvg.o \ + output-svg.o \ + fit.o \ + spline.o \ + curve.o \ + vector.o \ + epsilon-equal.o \ + autotrace.o \ + pxl-outline.o \ + bitmap.o \ + thin-image.o \ + logreport.o \ + exception.o \ + image-proc.o \ -ADDL_OBJECTS = \ +MERGE_OBJECTS = \ + pamtosvg.o2 \ output-svg.o \ fit.o \ spline.o \ @@ -28,12 +41,15 @@ ADDL_OBJECTS = \ exception.o \ image-proc.o \ -OBJECTS = pamtosvg.o $(ADDL_OBJECTS) +OBJECTS = $(PAMTOSVG_OBJECTS) -MERGE_OBJECTS = pamtosvg.o2 $(ADDL_OBJECTS) +MERGEBINARIES = $(BINARIES) all: $(BINARIES) include $(SRCDIR)/common.mk -pamtosvg: $(ADDL_OBJECTS) +pamtosvg: $(PAMTOSVG_OBJECTS) $(NETPBMLIB) $(LIBOPT) + $(LD) -o $@ $(PAMTOSVG_OBJECTS) \ + $(shell $(LIBOPT) $(NETPBMLIB)) \ + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) diff --git a/converter/other/pamtosvg/bitmap.h b/converter/other/pamtosvg/bitmap.h index b979e0c0..7334f138 100644 --- a/converter/other/pamtosvg/bitmap.h +++ b/converter/other/pamtosvg/bitmap.h @@ -36,7 +36,7 @@ at_bitmap_type * at_bitmap_new(unsigned short width, unsigned int planes); at_bitmap_type * at_bitmap_copy(at_bitmap_type * src); -/* We have to export functions that allows internal datum +/* We have to export functions that supports internal datum access. Such functions might be useful for at_bitmap_new user. */ unsigned short at_bitmap_get_width (at_bitmap_type * bitmap); diff --git a/converter/other/pamtosvg/image-proc.c b/converter/other/pamtosvg/image-proc.c index d025ee1e..b044b547 100644 --- a/converter/other/pamtosvg/image-proc.c +++ b/converter/other/pamtosvg/image-proc.c @@ -330,7 +330,7 @@ binarize(bitmap_type *bitmap) } else { - WARNING1("binarize: don't know how to interpret %u-plane images", spp); + WARNING1("binarize: %u-plane images are not supported", spp); } } diff --git a/converter/other/pamtosvg/thin-image.c b/converter/other/pamtosvg/thin-image.c index 364f67cc..86d1037c 100644 --- a/converter/other/pamtosvg/thin-image.c +++ b/converter/other/pamtosvg/thin-image.c @@ -189,7 +189,7 @@ thin_image(bitmap_type *image, bool bgSpec, pixel bg, default: { - LOG1 ("thin_image: Don't know how to interpret %u-plane images", spp); + LOG1 ("thin_image: %u-plane images are not supported", spp); at_exception_fatal(exp, "thin_image: wrong plane images are passed"); goto cleanup; } |