diff options
| author | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-19 00:29:12 +0400 |
|---|---|---|
| committer | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-19 00:29:12 +0400 |
| commit | b072e90c262fef233872e34f93bf298ce0d1fa03 (patch) | |
| tree | ee8fd84e6d0e594d6e884e8be7e31d2c24be47fe /src/apps/mplayerc/libpng.c | |
| parent | 5215e9e5c05dcfc26b4314a2b52966cbcea5306f (diff) | |
Style patch part1. based on newly released astyle 1.24.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1790 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc/libpng.c')
| -rw-r--r-- | src/apps/mplayerc/libpng.c | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/apps/mplayerc/libpng.c b/src/apps/mplayerc/libpng.c index ee43b788e..3c7b64360 100644 --- a/src/apps/mplayerc/libpng.c +++ b/src/apps/mplayerc/libpng.c @@ -29,31 +29,31 @@ static void read_data_fn(png_structp png_ptr, png_bytep data, png_size_t length)
{
- struct png_t* png = (struct png_t*)png_get_progressive_ptr(png_ptr);
- if(png->pos + length > png->size) png_error(png_ptr, "Read Error");
- memcpy(data, &png->data[png->pos], length);
- png->pos += length;
+ struct png_t* png = (struct png_t*)png_get_progressive_ptr(png_ptr);
+ if(png->pos + length > png->size) png_error(png_ptr, "Read Error");
+ memcpy(data, &png->data[png->pos], length);
+ png->pos += length;
}
unsigned char* DecompressPNG(struct png_t* png, int* w, int* h)
{
png_structp png_ptr;
- png_infop info_ptr;
- png_infop end_info;
+ png_infop info_ptr;
+ png_infop end_info;
- unsigned char* pic;
- unsigned char* row;
- unsigned int x, y, c;
+ unsigned char* pic;
+ unsigned char* row;
+ unsigned int x, y, c;
- if(png_sig_cmp(png->data, 0, 8) != 0)
- return NULL;
+ if(png_sig_cmp(png->data, 0, 8) != 0)
+ return NULL;
- png->pos = 8;
+ png->pos = 8;
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- // (png_voidp)user_error_ptr, user_error_fn, user_warning_fn);
- if(!png_ptr)
- return NULL;
+ // (png_voidp)user_error_ptr, user_error_fn, user_warning_fn);
+ if(!png_ptr)
+ return NULL;
png_set_read_fn(png_ptr, (png_voidp)png, read_data_fn);
@@ -77,42 +77,42 @@ unsigned char* DecompressPNG(struct png_t* png, int* w, int* h) return NULL;
}
- png_set_sig_bytes(png_ptr, 8);
+ png_set_sig_bytes(png_ptr, 8);
- png_read_png(
- png_ptr, info_ptr,
- PNG_TRANSFORM_STRIP_16 |
- PNG_TRANSFORM_STRIP_ALPHA |
- PNG_TRANSFORM_PACKING |
- PNG_TRANSFORM_EXPAND |
- PNG_TRANSFORM_BGR,
- NULL);
+ png_read_png(
+ png_ptr, info_ptr,
+ PNG_TRANSFORM_STRIP_16 |
+ PNG_TRANSFORM_STRIP_ALPHA |
+ PNG_TRANSFORM_PACKING |
+ PNG_TRANSFORM_EXPAND |
+ PNG_TRANSFORM_BGR,
+ NULL);
- if(png_get_channels(png_ptr, info_ptr) != 3)
- {
+ if(png_get_channels(png_ptr, info_ptr) != 3)
+ {
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- return NULL;
- }
-
- pic = calloc(info_ptr->width * info_ptr->height, 4);
+ return NULL;
+ }
- *w = info_ptr->width;
- *h = info_ptr->height;
+ pic = calloc(info_ptr->width * info_ptr->height, 4);
- for(y = 0; y < info_ptr->height; y++)
- {
- row = &pic[y * info_ptr->width * 4];
+ *w = info_ptr->width;
+ *h = info_ptr->height;
- for(x = 0; x < info_ptr->width*3; row += 4)
- {
- for(c = 0; c < 3; c++)
- {
- row[c] = info_ptr->row_pointers[y][x++];
- }
- }
- }
+ for(y = 0; y < info_ptr->height; y++)
+ {
+ row = &pic[y * info_ptr->width * 4];
+
+ for(x = 0; x < info_ptr->width*3; row += 4)
+ {
+ for(c = 0; c < 3; c++)
+ {
+ row[c] = info_ptr->row_pointers[y][x++];
+ }
+ }
+ }
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- return pic;
+ return pic;
}
|