summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ghostscript.com>2010-04-08 21:22:38 +0200
committerTor Andersson <tor@ghostscript.com>2010-04-08 21:22:38 +0200
commit6c8cce936b82e3fd939d9d407bd10829025e50b2 (patch)
tree8dbcee903fe34b630bc1d1f50408adec05b500e7
parent2c0b482e2e02ecf4bcf1224fb4206867522f75ab (diff)
downloadmupdf-6c8cce936b82e3fd939d9d407bd10829025e50b2.tar.xz
Move fz_pixmap from draw directory to fitz.
-rw-r--r--Makefile5
-rw-r--r--fitz/res_pixmap.c (renamed from draw/pixmap.c)0
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 32d5e853..bcf1c7e2 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,8 @@ FITZ_SRC=$(addprefix fitz/, \
filt_jbig2d.c filt_jpxd.c filt_lzwd.c filt_pipeline.c filt_predict.c \
dev_null.c dev_text.c dev_draw.c dev_list.c dev_trace.c \
obj_array.c obj_dict.c obj_parse.c obj_print.c obj_simple.c \
- res_colorspace.c res_font.c res_shade.c res_path.c res_text.c \
+ res_colorspace.c res_font.c res_shade.c res_pixmap.c \
+ res_path.c res_text.c \
stm_buffer.c stm_filter.c stm_misc.c stm_open.c stm_read.c \
util_getopt.c util_gettimeofday.c )
FITZ_OBJ=$(FITZ_SRC:fitz/%.c=$(OBJDIR)/%.o)
@@ -110,7 +111,7 @@ $(FITZ_LIB): $(FITZ_OBJ)
DRAW_SRC=$(addprefix draw/, \
blendmodes.c glyphcache.c imagedraw.c imagescale.c imageunpack.c meshdraw.c \
- pathfill.c pathscan.c pathstroke.c pixmap.c porterduff.c )
+ pathfill.c pathscan.c pathstroke.c porterduff.c )
DRAW_OBJ=$(DRAW_SRC:draw/%.c=$(OBJDIR)/%.o)
DRAW_LIB=$(OBJDIR)/libdraw.a
diff --git a/draw/pixmap.c b/fitz/res_pixmap.c
index dd42fb31..dd42fb31 100644
--- a/draw/pixmap.c
+++ b/fitz/res_pixmap.c