Manfred Hollstein
68577f0783
- gcc-11 complains about comparing pointers with it; add fix for it: * gli-std::strstr.patch OBS-URL: https://build.opensuse.org/request/show/896883 OBS-URL: https://build.opensuse.org/package/show/science/gli?expand=0&rev=9
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
diff -rup gli-0.8.2.0.orig/manual.md gli-0.8.2.0/manual.md
|
|
--- gli-0.8.2.0.orig/manual.md 2016-11-12 23:36:01.000000000 +0100
|
|
+++ gli-0.8.2.0/manual.md 2021-06-02 11:37:08.815699456 +0200
|
|
@@ -135,7 +135,7 @@ bool convert_rgb32f_rgb9e5(const char* F
|
|
{
|
|
if(FilenameDst == NULL)
|
|
return false;
|
|
- if(std::strstr(FilenameDst, ".dds") > 0 || std::strstr(FilenameDst, ".ktx") > 0)
|
|
+ if(std::strstr(FilenameDst, ".dds") != nullptr || std::strstr(FilenameDst, ".ktx") != nullptr)
|
|
return false;
|
|
|
|
gli::texture2d TextureSource(gli::load(FilenameSrc));
|
|
diff -rup gli-0.8.2.0.orig/test/core/core_convert.cpp gli-0.8.2.0/test/core/core_convert.cpp
|
|
--- gli-0.8.2.0.orig/test/core/core_convert.cpp 2016-11-12 23:36:01.000000000 +0100
|
|
+++ gli-0.8.2.0/test/core/core_convert.cpp 2021-06-02 11:37:18.087762356 +0200
|
|
@@ -32,7 +32,7 @@ bool convert_rgb32f_rgb9e5(const char* F
|
|
{
|
|
if(FilenameDst == NULL)
|
|
return false;
|
|
- if(std::strstr(FilenameDst, ".dds") > 0 || std::strstr(FilenameDst, ".ktx") > 0)
|
|
+ if(std::strstr(FilenameDst, ".dds") != nullptr || std::strstr(FilenameDst, ".ktx") != nullptr)
|
|
return false;
|
|
|
|
gli::texture2d TextureSource(gli::load(FilenameSrc));
|