Skip to content

Minor fixes to make it compile again #4

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
cfinucane wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Minor fixes to make it compile again #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbbd9e5
Update to work with modern versions of libpng.
cfinucane Aug 21, 2013
2d17ae1
Fix typo: add library flags from pkg-config to LDLIBS, not cflags
cfinucane Aug 21, 2013
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ LDLIBS += -lpcap -lpthread #-lefence
# Optional C compiler and linker flags. Typical driftnet builds have support
# for displaying captured images in an X window, and need the following flags:
CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags libpng`
LDLIBS += -ljpeg -lgif `pkg-config --libs gtk+-2.0` `pkg-config --cflags libpng`
LDLIBS += -ljpeg -lgif `pkg-config --libs gtk+-2.0` `pkg-config --libs libpng`

# Alternatively, you can build a version of driftnet which can only be used
# in `adjunct' mode as the back end for some other image-processing program. To
Expand Down
2 changes: 1 addition & 1 deletion png.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ int png_load_img(img I) {
if (color_type == PNG_COLOR_TYPE_GRAY ||
color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
if (bit_depth < 8) {
png_set_gray_1_2_4_to_8(png_ptr);
png_set_expand_gray_1_2_4_to_8(png_ptr);
}
png_set_gray_to_rgb(png_ptr);
}
Expand Down