Syping/libragephoto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libragephoto: use ternary operator for flags

Browse source 
index.dox: remove unnecessary whitespaces
This commit is contained in:
Syping 2024-04-16 09:30:41 +02:00
parent 2d59f2acf9
commit bb2b98e5d8
3 changed files with 13 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/index.dox
View file

@ -9,7 +9,7 @@
<b>Getting started</b> <b>Getting started</b>
\subpage Build "Build libragephoto" \subpage Build "Build libragephoto"
\subpage Usage "Using libragephoto" \subpage Usage "Using libragephoto"
<b>Reference</b> <b>Reference</b>
\ref RagePhotoInstance "RagePhoto C API" \ref RagePhotoInstance "RagePhoto C API"

25
src/core/RagePhoto.c
View file

@ -681,9 +681,7 @@ const char* ragephoto_getphotojpeg(ragephoto_t instance_t)
RagePhotoInstance *instance = (RagePhotoInstance*)instance_t; RagePhotoInstance *instance = (RagePhotoInstance*)instance_t;
if (instance->data->jpeg) if (instance->data->jpeg)
return instance->data->jpeg; return instance->data->jpeg;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? NULL : nullchar;
return NULL;
return nullchar;
} }
uint64_t ragephotodata_getphotosignf(RagePhotoData *rp_data, uint32_t photoFormat) uint64_t ragephotodata_getphotosignf(RagePhotoData *rp_data, uint32_t photoFormat)
@ -737,9 +735,7 @@ const char* ragephoto_getphotodesc(ragephoto_t instance_t)
RagePhotoInstance *instance = (RagePhotoInstance*)instance_t; RagePhotoInstance *instance = (RagePhotoInstance*)instance_t;
if (instance->data->description) if (instance->data->description)
return instance->data->description; return instance->data->description;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? NULL : nullchar;
return NULL;
return nullchar;
} }
const char* ragephoto_getphotojson(ragephoto_t instance_t) const char* ragephoto_getphotojson(ragephoto_t instance_t)
@ -747,9 +743,7 @@ const char* ragephoto_getphotojson(ragephoto_t instance_t)
RagePhotoInstance *instance = (RagePhotoInstance*)instance_t; RagePhotoInstance *instance = (RagePhotoInstance*)instance_t;
if (instance->data->json) if (instance->data->json)
return instance->data->json; return instance->data->json;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? NULL : nullchar;
return NULL;
return nullchar;
} }
const char* ragephoto_getphotoheader(ragephoto_t instance_t) const char* ragephoto_getphotoheader(ragephoto_t instance_t)
@ -757,9 +751,7 @@ const char* ragephoto_getphotoheader(ragephoto_t instance_t)
RagePhotoInstance *instance = (RagePhotoInstance*)instance_t; RagePhotoInstance *instance = (RagePhotoInstance*)instance_t;
if (instance->data->header) if (instance->data->header)
return instance->data->header; return instance->data->header;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? NULL : nullchar;
return NULL;
return nullchar;
} }
const char* ragephoto_getphototitle(ragephoto_t instance_t) const char* ragephoto_getphototitle(ragephoto_t instance_t)
@ -767,9 +759,7 @@ const char* ragephoto_getphototitle(ragephoto_t instance_t)
RagePhotoInstance *instance = (RagePhotoInstance*)instance_t; RagePhotoInstance *instance = (RagePhotoInstance*)instance_t;
if (instance->data->title) if (instance->data->title)
return instance->data->title; return instance->data->title;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? NULL : nullchar;
return NULL;
return nullchar;
} }
const char* ragephoto_version() const char* ragephoto_version()
@ -1113,10 +1103,7 @@ void ragephoto_setbufferoffsets(ragephoto_t instance_t)
void ragephoto_setlibraryflag(RagePhotoLibraryFlag flag, bool state) void ragephoto_setlibraryflag(RagePhotoLibraryFlag flag, bool state)
{ {
if (state) state ? (libraryflags |= flag) : (libraryflags &= ~flag);
libraryflags |= flag;
else
libraryflags &= ~flag;
} }
bool ragephoto_setphotodata(ragephoto_t instance_t, RagePhotoData *rp_data) bool ragephoto_setphotodata(ragephoto_t instance_t, RagePhotoData *rp_data)

25
src/core/RagePhoto.cpp
View file

@ -643,9 +643,7 @@ const char* RagePhoto::jpegData() const
{ {
if (m_data->jpeg) if (m_data->jpeg)
return m_data->jpeg; return m_data->jpeg;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? nullptr : nullchar;
return nullptr;
return nullchar;
} }
uint64_t RagePhoto::jpegSign(uint32_t photoFormat, RagePhotoData *rp_data) uint64_t RagePhoto::jpegSign(uint32_t photoFormat, RagePhotoData *rp_data)
@ -685,36 +683,28 @@ const char* RagePhoto::description() const
{ {
if (m_data->description) if (m_data->description)
return m_data->description; return m_data->description;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? nullptr : nullchar;
return nullptr;
return nullchar;
} }
const char* RagePhoto::header() const const char* RagePhoto::header() const
{ {
if (m_data->header) if (m_data->header)
return m_data->header; return m_data->header;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? nullptr : nullchar;
return nullptr;
return nullchar;
} }
const char* RagePhoto::json() const const char* RagePhoto::json() const
{ {
if (m_data->json) if (m_data->json)
return m_data->json; return m_data->json;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? nullptr : nullchar;
return nullptr;
return nullchar;
} }
const char* RagePhoto::title() const const char* RagePhoto::title() const
{ {
if (m_data->title) if (m_data->title)
return m_data->title; return m_data->title;
if (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) return (libraryflags & RAGEPHOTO_FLAG_LEGACY_NULL_RETURN) ? nullptr : nullchar;
return nullptr;
return nullchar;
} }
const char* RagePhoto::version() const char* RagePhoto::version()
@ -1242,10 +1232,7 @@ void RagePhoto::setJson(const char *json, uint32_t bufferSize)
void RagePhoto::setLibraryFlag(RagePhotoLibraryFlag flag, bool state) void RagePhoto::setLibraryFlag(RagePhotoLibraryFlag flag, bool state)
{ {
if (state) state ? (libraryflags |= flag) : (libraryflags &= ~flag);
libraryflags |= flag;
else
libraryflags &= ~flag;
} }
void RagePhoto::setTitle(const char *title, uint32_t bufferSize) void RagePhoto::setTitle(const char *title, uint32_t bufferSize)