liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Placate some GCC warnings (#6563)

Browse Source
This commit is contained in:
Lawrence Lee 2022-09-05 18:05:35 -07:00
parent 6819b32be7
commit 4b97a5cf3c
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtengine/imagedata.cc
View File

@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <cstdint>
#include <functional> #include <functional>
#include <strings.h> #include <strings.h>
@ -601,7 +602,7 @@ FrameData::FrameData(rtexif::TagDirectory* frameRootDir_, rtexif::TagDirectory*
// ----------------------- Special file type detection (HDR, PixelShift) ------------------------ // ----------------------- Special file type detection (HDR, PixelShift) ------------------------
uint16 bitspersample = 0, samplesperpixel = 0, sampleformat = 0, photometric = 0, compression = 0; uint16_t bitspersample = 0, samplesperpixel = 0, sampleformat = 0, photometric = 0, compression = 0;
const rtexif::Tag* const bps = frameRootDir->findTag("BitsPerSample"); const rtexif::Tag* const bps = frameRootDir->findTag("BitsPerSample");
const rtexif::Tag* const spp = frameRootDir->findTag("SamplesPerPixel"); const rtexif::Tag* const spp = frameRootDir->findTag("SamplesPerPixel");
const rtexif::Tag* const sf = frameRootDir->findTag("SampleFormat"); const rtexif::Tag* const sf = frameRootDir->findTag("SampleFormat");

23
rtengine/imageio.cc
View File

@ -21,6 +21,7 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <tiff.h> #include <tiff.h>
#include <tiffio.h> #include <tiffio.h>
#include <cstdint>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <fcntl.h> #include <fcntl.h>
@ -664,7 +665,7 @@ int ImageIO::getTIFFSampleFormat (const Glib::ustring &fname, IIOSampleFormat &s
return IMIO_CANNOTREADFILE; return IMIO_CANNOTREADFILE;
} }
uint16 bitspersample = 0, samplesperpixel = 0, sampleformat = 0; uint16_t bitspersample = 0, samplesperpixel = 0, sampleformat = 0;
int hasTag = TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bitspersample); int hasTag = TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bitspersample);
hasTag &= TIFFGetField(in, TIFFTAG_SAMPLESPERPIXEL, &samplesperpixel); hasTag &= TIFFGetField(in, TIFFTAG_SAMPLESPERPIXEL, &samplesperpixel);
@ -689,7 +690,7 @@ int ImageIO::getTIFFSampleFormat (const Glib::ustring &fname, IIOSampleFormat &s
sampleformat = SAMPLEFORMAT_UINT; sampleformat = SAMPLEFORMAT_UINT;
} }
uint16 config; uint16_t config;
TIFFGetField(in, TIFFTAG_PLANARCONFIG, &config); TIFFGetField(in, TIFFTAG_PLANARCONFIG, &config);
if (config == PLANARCONFIG_CONTIG) { if (config == PLANARCONFIG_CONTIG) {
@ -701,14 +702,14 @@ int ImageIO::getTIFFSampleFormat (const Glib::ustring &fname, IIOSampleFormat &s
return IMIO_VARIANTNOTSUPPORTED; return IMIO_VARIANTNOTSUPPORTED;
} }
uint16 photometric; uint16_t photometric;
if (!TIFFGetField(in, TIFFTAG_PHOTOMETRIC, &photometric)) { if (!TIFFGetField(in, TIFFTAG_PHOTOMETRIC, &photometric)) {
TIFFClose(in); TIFFClose(in);
return IMIO_VARIANTNOTSUPPORTED; return IMIO_VARIANTNOTSUPPORTED;
} }
uint16 compression; uint16_t compression;
if (photometric == PHOTOMETRIC_LOGLUV) if (photometric == PHOTOMETRIC_LOGLUV)
if (!TIFFGetField(in, TIFFTAG_COMPRESSION, &compression)) { if (!TIFFGetField(in, TIFFTAG_COMPRESSION, &compression)) {
@ -786,7 +787,7 @@ int ImageIO::loadTIFF (const Glib::ustring &fname)
TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width); TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
TIFFGetField(in, TIFFTAG_IMAGELENGTH, &height); TIFFGetField(in, TIFFTAG_IMAGELENGTH, &height);
uint16 bitspersample, samplesperpixel; uint16_t bitspersample, samplesperpixel;
int hasTag = TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bitspersample); int hasTag = TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bitspersample);
hasTag &= TIFFGetField(in, TIFFTAG_SAMPLESPERPIXEL, &samplesperpixel); hasTag &= TIFFGetField(in, TIFFTAG_SAMPLESPERPIXEL, &samplesperpixel);
@ -798,7 +799,7 @@ int ImageIO::loadTIFF (const Glib::ustring &fname)
return IMIO_VARIANTNOTSUPPORTED; return IMIO_VARIANTNOTSUPPORTED;
} }
uint16 config; uint16_t config;
TIFFGetField(in, TIFFTAG_PLANARCONFIG, &config); TIFFGetField(in, TIFFTAG_PLANARCONFIG, &config);
if (config != PLANARCONFIG_CONTIG) { if (config != PLANARCONFIG_CONTIG) {
@ -819,7 +820,7 @@ int ImageIO::loadTIFF (const Glib::ustring &fname)
*/ */
if (settings->verbose) { if (settings->verbose) {
printf("Information of \"%s\":\n", fname.c_str()); printf("Information of \"%s\":\n", fname.c_str());
uint16 tiffDefaultScale, tiffBaselineExposure, tiffLinearResponseLimit; uint16_t tiffDefaultScale, tiffBaselineExposure, tiffLinearResponseLimit;
if (TIFFGetField(in, TIFFTAG_DEFAULTSCALE, &tiffDefaultScale)) { if (TIFFGetField(in, TIFFTAG_DEFAULTSCALE, &tiffDefaultScale)) {
printf(" DefaultScale: %d\n", tiffDefaultScale); printf(" DefaultScale: %d\n", tiffDefaultScale);
} }
@ -836,7 +837,7 @@ int ImageIO::loadTIFF (const Glib::ustring &fname)
else else
printf(" No LinearResponseLimit value!\n"); printf(" No LinearResponseLimit value!\n");
uint16 tiffMinValue, tiffMaxValue; uint16_t tiffMinValue, tiffMaxValue;
if (TIFFGetField(in, TIFFTAG_SMINSAMPLEVALUE, &tiffMinValue)) { if (TIFFGetField(in, TIFFTAG_SMINSAMPLEVALUE, &tiffMinValue)) {
printf(" MinValue: %d\n", tiffMinValue); printf(" MinValue: %d\n", tiffMinValue);
} }
@ -1556,15 +1557,15 @@ int ImageIO::saveTIFF (const Glib::ustring &fname, int bps, bool isFloat, bool u
*/ */
if (applyExifPatch) { if (applyExifPatch) {
unsigned char b[10]; unsigned char b[10];
uint16 tagCount = 0; uint16_t tagCount = 0;
lseek(fileno, 4, SEEK_SET); lseek(fileno, 4, SEEK_SET);
read(fileno, b, 4); read(fileno, b, 4);
uint32 ifd0Offset = rtexif::sget4(b, exifRoot->getOrder()); uint32_t ifd0Offset = rtexif::sget4(b, exifRoot->getOrder());
lseek(fileno, ifd0Offset, SEEK_SET); lseek(fileno, ifd0Offset, SEEK_SET);
read(fileno, b, 2); read(fileno, b, 2);
tagCount = rtexif::sget2(b, exifRoot->getOrder()); tagCount = rtexif::sget2(b, exifRoot->getOrder());
for (size_t i = 0; i < tagCount ; ++i) { for (size_t i = 0; i < tagCount ; ++i) {
uint16 tagID = 0; uint16_t tagID = 0;
read(fileno, b, 2); read(fileno, b, 2);
tagID = rtexif::sget2(b, exifRoot->getOrder()); tagID = rtexif::sget2(b, exifRoot->getOrder());
if (tagID == 0x8769) { if (tagID == 0x8769) {

8
rtgui/myflatcurve.cc
View File

@ -1643,7 +1643,8 @@ void MyFlatCurve::movePoint(bool moveX, bool moveY, bool pipetteDrag)
void MyFlatCurve::getCursorPosition(Gdk::EventType evType, bool isHint, int evX, int evY, Gdk::ModifierType modifierKey) void MyFlatCurve::getCursorPosition(Gdk::EventType evType, bool isHint, int evX, int evY, Gdk::ModifierType modifierKey)
{ {
int tx, ty; int tx, ty;
int prevCursorX, prevCursorY; int prevCursorX = cursorX;
int prevCursorY = cursorY;
double incrementX = 1. / double(graphW); double incrementX = 1. / double(graphW);
double incrementY = 1. / double(graphH); double incrementY = 1. / double(graphH);
@ -1672,11 +1673,6 @@ void MyFlatCurve::getCursorPosition(Gdk::EventType evType, bool isHint, int evX,
break; break;
} }
if (editedHandle != FCT_EditedHandle_None) {
prevCursorX = cursorX;
prevCursorY = cursorY;
}
cursorX = tx - graphX; cursorX = tx - graphX;
cursorY = graphY - ty; cursorY = graphY - ty;

2
rtgui/rtimage.cc
View File

@ -38,7 +38,7 @@ int RTImage::scaleBack = 0;
RTImage::RTImage () {} RTImage::RTImage () {}
RTImage::RTImage (RTImage &other) : Gtk::Image(), surface(other.surface), pixbuf(other.pixbuf) RTImage::RTImage (RTImage &other) : sigc::trackable(), Glib::ObjectBase(), Gtk::Image(), surface(other.surface), pixbuf(other.pixbuf)
{ {
if (pixbuf) { if (pixbuf) {
set(pixbuf); set(pixbuf);