* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#define _GNU_SOURCE
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
* data to libpng and let it do its magic.
*/
+ png_color png_palette[256];
+ for (unsigned i = 0; i < 256; i++) {
+ png_palette[i].red = palette[i].red;
+ png_palette[i].green = palette[i].green;
+ png_palette[i].blue = palette[i].blue;
+ }
+
png_set_IHDR(png, info, width, height, 8,
PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_DEFAULT,
PNG_FILTER_TYPE_DEFAULT);
- png_set_PLTE(png, info, (png_colorp)palette, 256);
+ png_set_PLTE(png, info, png_palette, 256);
png_set_rows(png, info, framedata);
png_write_png(png, info, PNG_TRANSFORM_IDENTITY, NULL);
} else {
}
/* Read the external palette, if any. */
- if (palf && lbximg_loadpalette(palf, palette) == -1) {
+ if (palf && lbximg_loadpalette(palf, &lbx_default_fops, palette) != 0) {
errmsg("error reading external palette: %s\n", lbx_strerror());
return -1;
}
int main(int argc, char **argv)
{
- int mode = MODE_NONE;
- FILE *inf = stdin, *palf = NULL, *overf = NULL;
+ int mode = MODE_NONE, opt, rc = EXIT_FAILURE;
+ struct lbx_pipe_state state = { .f = stdin };
+ FILE *palf = NULL, *overf = NULL;
const char *name = "stdin";
LBX_IMG *img;
- int opt;
static const char *sopts = "idvf:p:O:V";
static const struct option lopts[] = {
verbose = 1;
break;
case 'f':
- if (strcmp(optarg, "-") == 0)
- break;
-
name = strrchr(optarg, '/');
name = name ? name+1 : optarg;
- inf = fopen(optarg, "rb");
- if (!inf) {
+ if (!freopen(optarg, "rb", state.f)) {
errmsg("failed to open %s: %m\n", optarg);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- img = lbximg_fopen(inf);
+ if (fseek(state.f, 0, SEEK_CUR) == 0)
+ img = lbximg_open(state.f, &lbx_default_fops, NULL);
+ else
+ img = lbximg_open(&state, &lbx_pipe_fops, NULL);
+
if (!img) {
errmsg("failed to open image: %s.\n", lbx_strerror());
return EXIT_FAILURE;
switch (mode) {
case MODE_DECODE:
- if (decode(img, palf, overf, &argv[optind])) {
- lbximg_close(img);
- return EXIT_FAILURE;
- }
+ rc = decode(img, palf, overf, &argv[optind]);
break;
}
lbximg_close(img);
- return EXIT_SUCCESS;
+ return rc;
}