mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libfreeimage: fix patch CRLF line endings

Browse Source 
libfreeimage is a mixed CRLF-LF source code. The patch introduced by
commit d3ee0c781e (package/libfreeimage: fix musl build) was missing
the CRLF where they were needed (because patchwork mangles them?).

Fix the three hunks in two files that have the issue.

Reported-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 5b4db6b70f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN
2022-08-07 09:11:05 +02:00
committed by Peter Korsgaard
parent e39aced8fd
commit cdbf759e67
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
package/libfreeimage/0004-fixed-C-11-warnings.patch
View File

@@ -8,50 +8,50 @@ Index: trunk/Source/FreeImage/CacheFile.cpp
--- trunk/Source/FreeImage/CacheFile.cpp (révision 1895) --- trunk/Source/FreeImage/CacheFile.cpp (révision 1895)
+++ trunk/Source/FreeImage/CacheFile.cpp (révision 1896) +++ trunk/Source/FreeImage/CacheFile.cpp (révision 1896)
@@ -147,10 +147,14 @@ @@ -147,10 +147,14 @@
m_current_block->data = new BYTE[BLOCK_SIZE]; m_current_block->data = new BYTE[BLOCK_SIZE];
fseek(m_file, m_current_block->nr * BLOCK_SIZE, SEEK_SET); fseek(m_file, m_current_block->nr * BLOCK_SIZE, SEEK_SET);
- fread(m_current_block->data, BLOCK_SIZE, 1, m_file); - fread(m_current_block->data, BLOCK_SIZE, 1, m_file);
- -
- m_page_cache_mem.splice(m_page_cache_mem.begin(), m_page_cache_disk, it->second); - m_page_cache_mem.splice(m_page_cache_mem.begin(), m_page_cache_disk, it->second);
- m_page_map[nr] = m_page_cache_mem.begin(); - m_page_map[nr] = m_page_cache_mem.begin();
+ if (fread(m_current_block->data, BLOCK_SIZE, 1, m_file) == 1) { + if (fread(m_current_block->data, BLOCK_SIZE, 1, m_file) == 1) {
+ m_page_cache_mem.splice(m_page_cache_mem.begin(), m_page_cache_disk, it->second); + m_page_cache_mem.splice(m_page_cache_mem.begin(), m_page_cache_disk, it->second);
+ m_page_map[nr] = m_page_cache_mem.begin(); + m_page_map[nr] = m_page_cache_mem.begin();
+ } + }
+ else { + else {
+ FreeImage_OutputMessageProc(FIF_UNKNOWN, "Failed to lock a block in CacheFile"); + FreeImage_OutputMessageProc(FIF_UNKNOWN, "Failed to lock a block in CacheFile");
+ return NULL; + return NULL;
+ } + }
} }
// if the memory cache size is too large, swap an item to disc // if the memory cache size is too large, swap an item to disc
Index: trunk/Source/FreeImage/MultiPage.cpp Index: trunk/Source/FreeImage/MultiPage.cpp
=================================================================== ===================================================================
--- trunk/Source/FreeImage/MultiPage.cpp (révision 1895) --- trunk/Source/FreeImage/MultiPage.cpp (révision 1895)
+++ trunk/Source/FreeImage/MultiPage.cpp (révision 1896) +++ trunk/Source/FreeImage/MultiPage.cpp (révision 1896)
@@ -271,8 +271,8 @@ @@ -271,8 +271,8 @@
} }
} }
- std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP); - std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
- std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER); - std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
+ std::unique_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP); + std::unique_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
+ std::unique_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER); + std::unique_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
header->m_filename = filename; header->m_filename = filename;
// io is default // io is default
header->node = node; header->node = node;
@@ -339,8 +339,8 @@ @@ -339,8 +339,8 @@
PluginNode *node = list->FindNodeFromFIF(fif); PluginNode *node = list->FindNodeFromFIF(fif);
if (node) { if (node) {
- std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP); - std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
- std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER); - std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
+ std::unique_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP); + std::unique_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
+ std::unique_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER); + std::unique_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
header->io = *io; header->io = *io;
header->node = node; header->node = node;
header->fif = fif; header->fif = fif;
Index: trunk/Source/FreeImage/PSDParser.cpp Index: trunk/Source/FreeImage/PSDParser.cpp
=================================================================== ===================================================================
--- trunk/Source/FreeImage/PSDParser.cpp (révision 1895) --- trunk/Source/FreeImage/PSDParser.cpp (révision 1895)