Date: Wed, 7 Nov 2012 01:33:29 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219635 for review Message-ID: <201211070133.qA71XTh8088619@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@219635?ac=10 Change 219635 by brooks@brooks_zenith on 2012/11/07 01:33:18 Integrate updates to libimagebox and fix buildworld. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile#4 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/Makefile#2 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#2 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/readpng/Makefile#2 delete .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/readpng/readpng.c#2 delete .. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#7 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/readpng.c#1 branch Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile#4 (text+ko) ==== @@ -4,8 +4,8 @@ .include <bsd.own.mk> SUBDIR= libde4tc \ - libimagebox \ libvuln_magic \ - libvuln_png + libvuln_png \ + libimagebox .include <bsd.subdir.mk> ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/Makefile#2 (text+ko) ==== @@ -19,6 +19,4 @@ #WARNS?= 6 -SUBDIR= readpng - .include <bsd.lib.mk> ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#2 (text+ko) ==== @@ -112,8 +112,6 @@ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); - printf("bit_depth = %d, color_type = %d\n", bit_depth, color_type); - if (width != ids->is->width || height != ids->is->height) { ids->is->error = 1; goto error; ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#7 (text+ko) ==== @@ -3,6 +3,7 @@ SUBDIR= browser \ cycle_led \ flashit \ + libexec \ minifile \ mtlctl \ pictview \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211070133.qA71XTh8088619>