Skip to content

Create a recompress library to embedding in other sources #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Create a recompress library to embedding in other sources #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
35b7921
Add editorconfig file to help keep some formatting consistent.
pope Jan 10, 2018
0eaa9c5
Support 64bit builds of mozjepg on Linux
pope Jan 10, 2018
d7aeaa8
Start support of recompress library by grouping options into one str…
pope Jan 10, 2018
9eb5a26
readFile should have a `const char*` for the name
pope Jan 10, 2018
522992c
Create the recompress library.
pope Jan 10, 2018
4ed03a9
Ignore *.exe files
pope Jan 11, 2018
fc81be5
Make recompess threadsafe by passing `quiet` to `info()`.
pope Jan 11, 2018
32a2a08
Normalize the newline situation.
pope Jan 11, 2018
46fab97
VERSION should be declared as an `extern onst char *`
pope Jan 17, 2018
5b51782
Only read input once
rikonor Mar 14, 2018
458baed
Small simplifications
rikonor Mar 14, 2018
7426063
Merge branch 'rikonor-fix-stdio' into lib-recompress
pope Mar 19, 2018
5227a71
Handle METHOD_UNKNOWN in switch statements.
pope Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[*.{h,c}]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true

[Makefile]
indent_style = tab
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.exe
src/*.o
src/iqa/.svn
src/iqa/build
Expand All @@ -10,3 +11,4 @@ comparison
comparison.png
test/test.jpg
test/test
.DS_Store
9 changes: 7 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@ MAKE ?= make
PREFIX ?= /usr/local

UNAME_S := $(shell uname -s)
LBITS := $(shell getconf LONG_BIT)

ifeq ($(UNAME_S),Linux)
# Linux (e.g. Ubuntu)
MOZJPEG_PREFIX ?= /opt/mozjpeg
CFLAGS += -I$(MOZJPEG_PREFIX)/include
LIBJPEG = $(MOZJPEG_PREFIX)/lib/libjpeg.a
ifeq ($(LBITS),64)
LIBJPEG = $(MOZJPEG_PREFIX)/lib64/libjpeg.a
else
LIBJPEG = $(MOZJPEG_PREFIX)/lib/libjpeg.a
endif
else ifeq ($(UNAME_S),Darwin)
# Mac OS X
MOZJPEG_PREFIX ?= /usr/local/opt/mozjpeg
Expand All @@ -33,7 +38,7 @@ all: jpeg-recompress jpeg-compare jpeg-hash
$(LIBIQA):
cd src/iqa; RELEASE=1 $(MAKE)

jpeg-recompress: jpeg-recompress.c src/util.o src/edit.o src/smallfry.o src/commander.o $(LIBIQA)
jpeg-recompress: jpeg-recompress.c src/util.o src/edit.o src/smallfry.o src/commander.o src/recompress.o $(LIBIQA)
$(CC) $(CFLAGS) -o $@ $^ $(LIBJPEG) $(LDFLAGS)

jpeg-compare: jpeg-compare.c src/util.o src/hash.o src/edit.o src/commander.o src/smallfry.o $(LIBIQA)
Expand Down
Loading