From aa69b7d58eb5be52e9109ee85381d55617c26464 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:48:36 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- kernel/kls_camera/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_dds/dds.cpp | 4 ++-- kernel/kls_dds/fmt_codec_dds.cpp | 4 ++-- kernel/kls_djvu/fmt_codec_pnm.cpp | 2 +- kernel/kls_dxf/fmt_codec_pnm.cpp | 2 +- kernel/kls_eps/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_fig/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_gif/fmt_codec_gif.cpp | 12 +++++----- kernel/kls_hdr/fmt_codec_hdr.cpp | 4 ++-- kernel/kls_ico/fmt_codec_ico.cpp | 2 +- kernel/kls_iff/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_jpeg2000/fmt_codec_jpeg2000.cpp | 14 ++++++------ kernel/kls_leaf/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_ljpeg/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_mac/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_mng/fmt_codec_mng.cpp | 4 ++-- kernel/kls_neo/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_openexr/fmt_codec_openexr.cpp | 4 ++-- kernel/kls_pi1/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_pi3/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_pict/fmt_codec_pnm.cpp | 2 +- kernel/kls_png/fmt_codec_png.cpp | 26 ++++++++++----------- kernel/kls_pnm/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_psd/fmt_codec_psd.cpp | 4 ++-- kernel/kls_psp/fmt_codec_psp.cpp | 36 +++++++++++++++--------------- kernel/kls_svg/fmt_codec_png.cpp | 18 +++++++-------- kernel/kls_tiff/fmt_codec_tiff.cpp | 2 +- kernel/kls_ttf/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_utah/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_xcf/fmt_codec_pnm.cpp | 4 ++-- kernel/kls_xim/fmt_codec_pnm.cpp | 4 ++-- 31 files changed, 100 insertions(+), 100 deletions(-) diff --git a/kernel/kls_camera/fmt_codec_pnm.cpp b/kernel/kls_camera/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_camera/fmt_codec_pnm.cpp +++ b/kernel/kls_camera/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_dds/dds.cpp b/kernel/kls_dds/dds.cpp index ef07bdd..c00c388 100644 --- a/kernel/kls_dds/dds.cpp +++ b/kernel/kls_dds/dds.cpp @@ -55,7 +55,7 @@ static bool MALLOC_ROWS(RGBAP **A, const int RB, const int H) return false; for(s32 row = 0; row < H; row++) - (*A)[row] = 0; + (*A)[row] = nullptr; for(s32 row = 0; row < (s32)H; row++) { @@ -1053,7 +1053,7 @@ bool dds_read(const std::string &file, DDSINFO &dds) if(!s.good() || !IsValid(header) || !IsSupported(header)) return false; - RGBA **img = 0; + RGBA **img = nullptr; bool result; if(IsCubeMap(header)) diff --git a/kernel/kls_dds/fmt_codec_dds.cpp b/kernel/kls_dds/fmt_codec_dds.cpp index 305c207..317c39c 100644 --- a/kernel/kls_dds/fmt_codec_dds.cpp +++ b/kernel/kls_dds/fmt_codec_dds.cpp @@ -48,7 +48,7 @@ inline void FREE_ROWS(RGBAP **A, const int H) } free(*A); - *A = 0; + *A = nullptr; } } @@ -87,7 +87,7 @@ s32 fmt_codec::read_init(const std::string &file) finfo.animated = false; - dds.img = 0; + dds.img = nullptr; dds.w = dds.h = 0; if(!dds_read(file, dds)) diff --git a/kernel/kls_djvu/fmt_codec_pnm.cpp b/kernel/kls_djvu/fmt_codec_pnm.cpp index f7c94b4..6e17623 100644 --- a/kernel/kls_djvu/fmt_codec_pnm.cpp +++ b/kernel/kls_djvu/fmt_codec_pnm.cpp @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_dxf/fmt_codec_pnm.cpp b/kernel/kls_dxf/fmt_codec_pnm.cpp index f7c94b4..6e17623 100644 --- a/kernel/kls_dxf/fmt_codec_pnm.cpp +++ b/kernel/kls_dxf/fmt_codec_pnm.cpp @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_eps/fmt_codec_pnm.cpp b/kernel/kls_eps/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_eps/fmt_codec_pnm.cpp +++ b/kernel/kls_eps/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_fig/fmt_codec_pnm.cpp b/kernel/kls_fig/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_fig/fmt_codec_pnm.cpp +++ b/kernel/kls_fig/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_gif/fmt_codec_gif.cpp b/kernel/kls_gif/fmt_codec_gif.cpp index 93ed98a..95c643a 100644 --- a/kernel/kls_gif/fmt_codec_gif.cpp +++ b/kernel/kls_gif/fmt_codec_gif.cpp @@ -114,10 +114,10 @@ s32 fmt_codec::read_init(const std::string &file) transIndex = -1; - Last = 0; - Lines = 0; - buf = 0; - saved = 0; + Last = nullptr; + Lines = nullptr; + buf = nullptr; + saved = nullptr; #if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR > 4 int ErrorCode; @@ -551,7 +551,7 @@ void fmt_codec::read_close() free(Lines[i]); free(Lines); - Lines = 0; + Lines = nullptr; } if(Last) @@ -561,7 +561,7 @@ void fmt_codec::read_close() free(Last[i]); free(Last); - Last = 0; + Last = nullptr; } finfo.meta.clear(); diff --git a/kernel/kls_hdr/fmt_codec_hdr.cpp b/kernel/kls_hdr/fmt_codec_hdr.cpp index 91f4803..982d95b 100644 --- a/kernel/kls_hdr/fmt_codec_hdr.cpp +++ b/kernel/kls_hdr/fmt_codec_hdr.cpp @@ -65,7 +65,7 @@ void fmt_codec::options(codec_options *o) s32 fmt_codec::read_init(const std::string &file) { - scanline = 0; + scanline = nullptr; frs.open(file.c_str(), ios::binary | ios::in); @@ -155,7 +155,7 @@ void fmt_codec::read_close() finfo.image.clear(); delete [] scanline; - scanline = 0; + scanline = nullptr; } // diff --git a/kernel/kls_ico/fmt_codec_ico.cpp b/kernel/kls_ico/fmt_codec_ico.cpp index af6a2f7..48f17ed 100644 --- a/kernel/kls_ico/fmt_codec_ico.cpp +++ b/kernel/kls_ico/fmt_codec_ico.cpp @@ -75,7 +75,7 @@ s32 fmt_codec::read_init(const std::string &file) currentImage = -1; pal_entr = 0; - bAND = 0; + bAND = nullptr; if(!frs.readK(&ifh, sizeof(ICO_HEADER))) return SQE_R_BADFILE; diff --git a/kernel/kls_iff/fmt_codec_pnm.cpp b/kernel/kls_iff/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_iff/fmt_codec_pnm.cpp +++ b/kernel/kls_iff/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_jpeg2000/fmt_codec_jpeg2000.cpp b/kernel/kls_jpeg2000/fmt_codec_jpeg2000.cpp index b5a0eee..a6c6a70 100644 --- a/kernel/kls_jpeg2000/fmt_codec_jpeg2000.cpp +++ b/kernel/kls_jpeg2000/fmt_codec_jpeg2000.cpp @@ -147,11 +147,11 @@ void fmt_codec::options(codec_options *o) s32 fmt_codec::read_init(const std::string &file) { - gs.image = 0; - gs.altimage = 0; - gs.data[0] = 0; - gs.data[1] = 0; - gs.data[2] = 0; + gs.image = nullptr; + gs.altimage = nullptr; + gs.data[0] = nullptr; + gs.data[1] = nullptr; + gs.data[2] = nullptr; if (!jasperInitialized) { @@ -180,7 +180,7 @@ s32 fmt_codec::read_next() fmt_image image; - gs.image = jas_image_decode(in, -1, 0); + gs.image = jas_image_decode(in, -1, nullptr); jas_stream_close(in); @@ -194,7 +194,7 @@ s32 fmt_codec::read_next() jas_image_destroy(gs.image); gs.image = gs.altimage; - gs.altimage = 0; + gs.altimage = nullptr; image.w = jas_image_width(gs.image); image.h = jas_image_height(gs.image); diff --git a/kernel/kls_leaf/fmt_codec_pnm.cpp b/kernel/kls_leaf/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_leaf/fmt_codec_pnm.cpp +++ b/kernel/kls_leaf/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_ljpeg/fmt_codec_pnm.cpp b/kernel/kls_ljpeg/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_ljpeg/fmt_codec_pnm.cpp +++ b/kernel/kls_ljpeg/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_mac/fmt_codec_pnm.cpp b/kernel/kls_mac/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_mac/fmt_codec_pnm.cpp +++ b/kernel/kls_mac/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_mng/fmt_codec_mng.cpp b/kernel/kls_mng/fmt_codec_mng.cpp index e25a18a..111b018 100644 --- a/kernel/kls_mng/fmt_codec_mng.cpp +++ b/kernel/kls_mng/fmt_codec_mng.cpp @@ -250,7 +250,7 @@ s32 fmt_codec::read_init(const std::string &file) mymng->filename = file; mymng->codec = this; - priv.frame = 0; + priv.frame = nullptr; priv.ms = 10; /* set up the mng decoder for our stream */ @@ -366,7 +366,7 @@ void fmt_codec::read_close() mng_cleanup(&mng); delete [] priv.frame; - priv.frame = 0; + priv.frame = nullptr; } #include "fmt_codec_cd_func.h" diff --git a/kernel/kls_neo/fmt_codec_pnm.cpp b/kernel/kls_neo/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_neo/fmt_codec_pnm.cpp +++ b/kernel/kls_neo/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_openexr/fmt_codec_openexr.cpp b/kernel/kls_openexr/fmt_codec_openexr.cpp index 86f7a13..a98b672 100644 --- a/kernel/kls_openexr/fmt_codec_openexr.cpp +++ b/kernel/kls_openexr/fmt_codec_openexr.cpp @@ -92,7 +92,7 @@ s32 fmt_codec::read_init(const std::string &fl) currentImage = -1; read_error = false; - pixels = 0; + pixels = nullptr; file = fl; finfo.animated = false; @@ -215,7 +215,7 @@ void fmt_codec::read_close() finfo.image.clear(); delete pixels; - pixels = 0; + pixels = nullptr; } /* diff --git a/kernel/kls_pi1/fmt_codec_pnm.cpp b/kernel/kls_pi1/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_pi1/fmt_codec_pnm.cpp +++ b/kernel/kls_pi1/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_pi3/fmt_codec_pnm.cpp b/kernel/kls_pi3/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_pi3/fmt_codec_pnm.cpp +++ b/kernel/kls_pi3/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_pict/fmt_codec_pnm.cpp b/kernel/kls_pict/fmt_codec_pnm.cpp index f7c94b4..6e17623 100644 --- a/kernel/kls_pict/fmt_codec_pnm.cpp +++ b/kernel/kls_pict/fmt_codec_pnm.cpp @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_png/fmt_codec_png.cpp b/kernel/kls_png/fmt_codec_png.cpp index eed37a7..96dadd4 100644 --- a/kernel/kls_png/fmt_codec_png.cpp +++ b/kernel/kls_png/fmt_codec_png.cpp @@ -69,7 +69,7 @@ inline bool MALLOC_ROWS(png_bytep **A, const int RB, const int H) return false; for(s32 row = 0; row < H; row++) - (*A)[row] = 0; + (*A)[row] = nullptr; for(s32 row = 0; row < (s32)H; row++) { @@ -95,7 +95,7 @@ inline void FREE_ROWS(png_bytep **A, const int H) } free(*A); - *A = 0; + *A = nullptr; } } @@ -164,12 +164,12 @@ void fmt_codec::fill_default_settings() s32 fmt_codec::read_init(const std::string &file) { - png_ptr = 0; - info_ptr = 0; - fptr = 0; - frame = 0; - prev = 0; - cur = 0; + png_ptr = nullptr; + info_ptr = nullptr; + fptr = nullptr; + frame = nullptr; + prev = nullptr; + cur = nullptr; zerror = false; #ifdef CODEC_SVG @@ -242,7 +242,7 @@ s32 fmt_codec::read_init(const std::string &file) currentImage = -1; - if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0)) == nullptr) + if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr)) == nullptr) { zerror = true; return SQE_R_NOMEMORY; @@ -543,9 +543,9 @@ void fmt_codec::getwriteoptions(fmt_writeoptionsabs *opt) s32 fmt_codec::write_init(const std::string &file, const fmt_image &image, const fmt_writeoptions &opt) { - m_png_ptr = 0; - m_info_ptr = 0; - m_fptr = 0; + m_png_ptr = nullptr; + m_info_ptr = nullptr; + m_fptr = nullptr; m_zerror = false; if(!image.w || !image.h || file.empty()) @@ -559,7 +559,7 @@ s32 fmt_codec::write_init(const std::string &file, const fmt_image &image, const if(!m_fptr) return SQE_W_NOFILE; - m_png_ptr = my_png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); + m_png_ptr = my_png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); if(!m_png_ptr) { diff --git a/kernel/kls_pnm/fmt_codec_pnm.cpp b/kernel/kls_pnm/fmt_codec_pnm.cpp index 184acfe..97debe4 100644 --- a/kernel/kls_pnm/fmt_codec_pnm.cpp +++ b/kernel/kls_pnm/fmt_codec_pnm.cpp @@ -537,7 +537,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1099,7 +1099,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_psd/fmt_codec_psd.cpp b/kernel/kls_psd/fmt_codec_psd.cpp index dad3863..c2c00ba 100644 --- a/kernel/kls_psd/fmt_codec_psd.cpp +++ b/kernel/kls_psd/fmt_codec_psd.cpp @@ -92,8 +92,8 @@ s32 fmt_codec::read_init(const std::string &file) if(ver != 1) return SQE_R_BADFILE; - last = 0; - L = 0; + last = nullptr; + L = nullptr; s8 dummy[6]; if(!frs.readK(dummy, 6)) return SQE_R_BADFILE; diff --git a/kernel/kls_psp/fmt_codec_psp.cpp b/kernel/kls_psp/fmt_codec_psp.cpp index e77caa4..681ba62 100644 --- a/kernel/kls_psp/fmt_codec_psp.cpp +++ b/kernel/kls_psp/fmt_codec_psp.cpp @@ -251,7 +251,7 @@ bool fmt_codec::ReadLayerBlock() NumChannels = Bitmap.NumChannels; for (i = 0; i < NumChannels; i++) - Channels[i] = 0; + Channels[i] = nullptr; for (i = 0; i < NumChannels; i++) { @@ -344,27 +344,27 @@ ILubyte *fmt_codec::GetChannel() { BLOCKHEAD Block; CHANNEL_CHUNK Channel; - ILubyte *CompData = 0, *Data = 0; + ILubyte *CompData = nullptr, *Data = nullptr; ILuint ChunkSize, Padding; if (!frs.readK(&Block, sizeof(Block))) - return 0; + return nullptr; if (Header.MajorVersion == 3) frs.readK(&Block.BlockLen, sizeof(Block.BlockLen)); if (Block.HeadID[0] != 0x7E || Block.HeadID[1] != 0x42 || Block.HeadID[2] != 0x4B || Block.HeadID[3] != 0x00) - return 0; + return nullptr; if (Block.BlockID != PSP_CHANNEL_BLOCK) - return 0; + return nullptr; if (Header.MajorVersion >= 4) { frs.readK(&ChunkSize, sizeof(ChunkSize)); if (!frs.readK(&Channel, sizeof(Channel))) - return 0; + return nullptr; Padding = (ChunkSize - 4) - sizeof(Channel); @@ -374,18 +374,18 @@ ILubyte *fmt_codec::GetChannel() else { if (!frs.readK(&Channel, sizeof(Channel))) - return 0; + return nullptr; } CompData = new ILubyte [Channel.CompLen]; if (!CompData) - return 0; + return nullptr; if (!frs.readK(CompData, Channel.CompLen)) { delete CompData; - return 0; + return nullptr; } if(AttChunk.Compression != PSP_COMP_NONE) @@ -395,7 +395,7 @@ ILubyte *fmt_codec::GetChannel() if (!Data) { delete CompData; - return 0; + return nullptr; } } @@ -409,14 +409,14 @@ ILubyte *fmt_codec::GetChannel() { delete Data; delete CompData; - return 0; + return nullptr; } break; default: delete Data; delete CompData; - return 0; + return nullptr; } delete CompData; @@ -495,9 +495,9 @@ bool fmt_codec::ReadPalette() s32 fmt_codec::read_init(const std::string &file) { - Channels = 0; - Alpha = 0; - pal = 0; + Channels = nullptr; + Alpha = nullptr; + pal = nullptr; frs.open(file.c_str(), ios::binary | ios::in); @@ -624,9 +624,9 @@ void fmt_codec::read_close() delete Alpha; delete pal; - Channels = 0; - Alpha = 0; - pal = 0; + Channels = nullptr; + Alpha = nullptr; + pal = nullptr; finfo.meta.clear(); finfo.image.clear(); diff --git a/kernel/kls_svg/fmt_codec_png.cpp b/kernel/kls_svg/fmt_codec_png.cpp index eed37a7..e8210ff 100644 --- a/kernel/kls_svg/fmt_codec_png.cpp +++ b/kernel/kls_svg/fmt_codec_png.cpp @@ -69,7 +69,7 @@ inline bool MALLOC_ROWS(png_bytep **A, const int RB, const int H) return false; for(s32 row = 0; row < H; row++) - (*A)[row] = 0; + (*A)[row] = nullptr; for(s32 row = 0; row < (s32)H; row++) { @@ -95,7 +95,7 @@ inline void FREE_ROWS(png_bytep **A, const int H) } free(*A); - *A = 0; + *A = nullptr; } } @@ -164,12 +164,12 @@ void fmt_codec::fill_default_settings() s32 fmt_codec::read_init(const std::string &file) { - png_ptr = 0; - info_ptr = 0; - fptr = 0; - frame = 0; - prev = 0; - cur = 0; + png_ptr = nullptr; + info_ptr = nullptr; + fptr = nullptr; + frame = nullptr; + prev = nullptr; + cur = nullptr; zerror = false; #ifdef CODEC_SVG @@ -242,7 +242,7 @@ s32 fmt_codec::read_init(const std::string &file) currentImage = -1; - if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0)) == nullptr) + if((png_ptr = my_png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr)) == nullptr) { zerror = true; return SQE_R_NOMEMORY; diff --git a/kernel/kls_tiff/fmt_codec_tiff.cpp b/kernel/kls_tiff/fmt_codec_tiff.cpp index 8a24379..f034d4d 100644 --- a/kernel/kls_tiff/fmt_codec_tiff.cpp +++ b/kernel/kls_tiff/fmt_codec_tiff.cpp @@ -176,7 +176,7 @@ s32 fmt_codec::read_next() memset(&img, 0, sizeof(TIFFRGBAImage)); - TIFFRGBAImageBegin(&img, ftiff, 1, 0); + TIFFRGBAImageBegin(&img, ftiff, 1, nullptr); bps = img.bitspersample; spp = img.samplesperpixel; diff --git a/kernel/kls_ttf/fmt_codec_pnm.cpp b/kernel/kls_ttf/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_ttf/fmt_codec_pnm.cpp +++ b/kernel/kls_ttf/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_utah/fmt_codec_pnm.cpp b/kernel/kls_utah/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_utah/fmt_codec_pnm.cpp +++ b/kernel/kls_utah/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_xcf/fmt_codec_pnm.cpp b/kernel/kls_xcf/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_xcf/fmt_codec_pnm.cpp +++ b/kernel/kls_xcf/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); diff --git a/kernel/kls_xim/fmt_codec_pnm.cpp b/kernel/kls_xim/fmt_codec_pnm.cpp index f7c94b4..8f6651d 100644 --- a/kernel/kls_xim/fmt_codec_pnm.cpp +++ b/kernel/kls_xim/fmt_codec_pnm.cpp @@ -538,7 +538,7 @@ static bool bbox(ifstreamK *io, int *x1, int *y1, int *x2, int *y2) s32 fmt_codec::read_init(const std::string &file) { - fptr = 0; + fptr = nullptr; #if defined CODEC_CAMERA std::vector params; @@ -1100,7 +1100,7 @@ s32 fmt_codec::read_init(const std::string &file) ghostfd = popen(str.str().c_str(), "w"); - if(ghostfd == 0) + if(!ghostfd) return SQE_R_BADFILE; fprintf(ghostfd, "\n%d %d translate\n", int(-floorf(x1*xScale)), int(-floorf(y1*yScale))); -- cgit v1.2.3