svnno****@sourc*****
svnno****@sourc*****
2008年 8月 7日 (木) 22:13:01 JST
ForkRevision: 7
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=swfed&view=rev&rev=7
Author: yoya
Date: 2008-08-07 22:13:01 +0900 (Thu, 07 Aug 2008)
Log Message:
-----------
エラーメッセージの修正
Modified Paths:
--------------
src/swf_png.c
src/swf_tag_jpeg.c
src/swf_tag_lossless.c
-------------- next part --------------
Modified: src/swf_png.c
===================================================================
--- src/swf_png.c 2008-08-06 17:59:18 UTC (rev 6)
+++ src/swf_png.c 2008-08-07 13:13:01 UTC (rev 7)
@@ -18,13 +18,17 @@
unsigned long data_offset;
} my_png_buffer;
+/*
+ * png read
+ */
+
static void png_data_read_func(png_structp png_ptr, png_bytep buf, png_size_t size){
my_png_buffer *png_buff = (my_png_buffer *)png_get_io_ptr(png_ptr);
if (png_buff->data_offset + size <= png_buff->data_len) {
memcpy(buf, png_buff->data + png_buff->data_offset, size);
png_buff->data_offset += size;
} else {
- fprintf(stderr, "! png_buff->data_offset(%lu) + size(%d) <= png_buff->data_len(%lu)\n",
+ fprintf(stderr, "png_data_read_func: ! png_buff->data_offset(%lu) + size(%d) <= png_buff->data_len(%lu)\n",
png_buff->data_offset, size, png_buff->data_len);
png_error(png_ptr,"png_read_read_func failed");
}
@@ -35,6 +39,10 @@
(png_rw_ptr)png_data_read_func);
}
+/*
+ * png write
+ */
+
void png_data_write_func(png_structp png_ptr, png_bytep buf, png_size_t size){
my_png_buffer *png_buff = (my_png_buffer *)png_get_io_ptr(png_ptr);
unsigned long new_data_len;
@@ -45,7 +53,7 @@
}
png_buff->data = realloc(png_buff->data, new_data_len);
if (png_buff->data == NULL) {
- fprintf(stderr, "can't realloc: new_data_len(%lu), data_len(%lu)\n",
+ fprintf(stderr, "png_data_write_func: can't realloc: new_data_len(%lu), data_len(%lu)\n",
new_data_len, png_buff->data_len);
png_error(png_ptr,"png_data_write_func failed");
@@ -84,18 +92,18 @@
is_png = png_check_sig((png_bytep)png_data, 8);
if (! is_png) {
- fprintf(stderr, "is not PNG!\n");
+ fprintf(stderr, "pngconv_png2lossless: is not PNG!\n");
return NULL;
}
png_ptr = png_create_read_struct
(PNG_LIBPNG_VER_STRING, NULL,NULL,NULL);
if (! png_ptr) {
- fprintf(stderr, "can't create read_struct\n");
+ fprintf(stderr, "pngconv_png2lossless: can't create read_struct\n");
return NULL;
}
png_info = png_create_info_struct(png_ptr);
if (! png_info) {
- fprintf(stderr, "can't create info_struct\n");
+ fprintf(stderr, "pngconv_png2lossless: can't create info_struct\n");
png_destroy_read_struct (&png_ptr, NULL, NULL);
return NULL;
}
@@ -111,7 +119,7 @@
*width = (unsigned short) png_width;
*height = (unsigned short) png_height;
if (bpp != 8) {
- fprintf(stderr, "bpp=%d not implemented yet.\n", bpp);
+ fprintf(stderr, "pngconv_png2lossless: bpp=%d not implemented yet.\n", bpp);
png_destroy_read_struct(&png_ptr, &png_info, NULL);
return NULL;
}
@@ -122,7 +130,7 @@
if (png_get_valid(png_ptr, png_info, PNG_INFO_tRNS))
png_set_tRNS_to_alpha(png_ptr);
} else {
- fprintf(stderr, "color_type=%d not implemented yet.\n", color_type);
+ fprintf(stderr, "pngconv_png2lossless: color_type=%d not implemented yet.\n", color_type);
png_destroy_read_struct(&png_ptr, &png_info, NULL);
return NULL;
}
@@ -176,7 +184,7 @@
int tag_no, int format,
unsigned long *length) {
if (format != 5) {
- fprintf(stderr, "format=%d not implemented yes.", format);
+ fprintf(stderr, "jpegconv_lossless2png: format=%d not implemented yes.\n", format);
return NULL;
}
Modified: src/swf_tag_jpeg.c
===================================================================
--- src/swf_tag_jpeg.c 2008-08-06 17:59:18 UTC (rev 6)
+++ src/swf_tag_jpeg.c 2008-08-07 13:13:01 UTC (rev 7)
@@ -75,7 +75,7 @@
(void) swf;
swf_tag_jpeg = calloc(sizeof(*swf_tag_jpeg), 1);
if (swf_tag_jpeg == NULL) {
- fprintf(stderr, "ERROR: swf_tag_jpeg_create_detail: can't calloc\n");
+ fprintf(stderr, "swf_tag_jpeg_create_detail: can't calloc\n");
return NULL;
}
bs = bitstream_open();
@@ -129,7 +129,7 @@
return 1;
}
if (data == NULL) {
- fprintf(stderr, "swf_tag_jpeg_identity_detail data==NULL\n");
+ fprintf(stderr, "swf_tag_jpeg_identity_detail: data==NULL\n");
return 1;
}
image_id = GetUShortLE(data);
Modified: src/swf_tag_lossless.c
===================================================================
--- src/swf_tag_lossless.c 2008-08-06 17:59:18 UTC (rev 6)
+++ src/swf_tag_lossless.c 2008-08-07 13:13:01 UTC (rev 7)
@@ -59,7 +59,7 @@
old_size = bitstream_length(bs) - offset;
result = uncompress(tmp_buff, &origsize, old_buff, old_size);
if (indices_len != origsize - 4 * swf_tag_lossless->colormap_count) {
- fprintf(stderr, "indices_len != origsize - 4 * swf_tag_lossless->colormap_count at line(%d)\n", __LINE__);
+ fprintf(stderr, "swf_tag_lossless_create_detail: indices_len != origsize - 4 * swf_tag_lossless->colormap_count at line(%d)\n", __LINE__);
free(tmp_buff);
bitstream_close(bs);
return NULL;
@@ -155,7 +155,7 @@
return 1;
}
if (data == NULL) {
- fprintf(stderr, "swf_tag_lossless_identity_detail data==NULL at line(%d)\n", __LINE__);
+ fprintf(stderr, "swf_tag_lossless_identity_detail: data==NULL at line(%d)\n", __LINE__);
return 1;
}
image_id = GetUShortLE(data);