diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-08-10 16:01:45 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-08-10 16:01:45 -0500 |
commit | 26849f4693bd508bc14c777a0e6ce09e9ed8de6c (patch) | |
tree | 8fb1e5b996a0de50b6537631eb2b0cd2c69b8a1f /pngwutil.c | |
parent | ad5a993954d6a029c641879dc9182e8e2f605c89 (diff) | |
download | libpng-26849f4693bd508bc14c777a0e6ce09e9ed8de6c.tar.gz |
[libpng16] Consistently use png_memset(), png_memcpy(), and png_memcmp(),
except in pngtest.c and example.c where these macros are not visible.
Diffstat (limited to 'pngwutil.c')
-rw-r--r-- | pngwutil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pngwutil.c b/pngwutil.c index ee80747a6..c687b86d4 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1663,7 +1663,7 @@ png_write_zTXt(png_structrp png_ptr, png_const_charp key, png_const_charp text, /* Compute the compressed data; do it now for the length */ png_text_compress_init(&comp, (png_const_bytep)text, - text == NULL ? 0 : strlen(text)); + text == NULL ? 0 : png_strlen(text)); if (png_text_compress(png_ptr, png_zTXt, &comp, key_len) != Z_OK) png_error(png_ptr, png_ptr->zstream.msg); @@ -1731,9 +1731,9 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key, * TODO: validate the language tag correctly (see the spec.) */ if (lang == NULL) lang = ""; /* empty language is valid */ - lang_len = strlen(lang)+1; + lang_len = png_strlen(lang)+1; if (lang_key == NULL) lang_key = ""; /* may be empty */ - lang_key_len = strlen(lang_key)+1; + lang_key_len = png_strlen(lang_key)+1; if (text == NULL) text = ""; /* may be empty */ prefix_len = key_len; @@ -1747,7 +1747,7 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key, else prefix_len = (png_uint_32)(prefix_len + lang_key_len); - png_text_compress_init(&comp, (png_const_bytep)text, strlen(text)); + png_text_compress_init(&comp, (png_const_bytep)text, png_strlen(text)); if (compression) { |