mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve jpeg check

Browse Source
This commit is contained in:
Jinhao
2019-03-09 22:55:37 +08:00
parent 2470848fba
commit f8604c06c8
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/paint/image.cpp
View File

@@ -1,7 +1,7 @@
/* /*
* Paint Image Implementation * Paint Image Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@@ -225,11 +225,16 @@ namespace paint
else else
{ {
#if defined(NANA_ENABLE_JPEG) #if defined(NANA_ENABLE_JPEG)
//JFIF if ((bytes > 11) && (0xd8ff == *reinterpret_cast<const unsigned short*>(data)))
if (bytes > 11 && (0xe0ffd8ff == *reinterpret_cast<const unsigned*>(data)) && 0x4649464A == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+6)) {
ptr = std::make_shared<detail::image_jpeg>(); switch(*reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+6))
else if (bytes > 9 && (0x66697845 == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+6))) //Exif {
ptr = std::make_shared<detail::image_jpeg>(); case 0x4649464A: //JFIF
case 0x66697845: //Exif
ptr = std::make_shared<detail::image_jpeg>();
}
}
else
#endif #endif
if ((!ptr) && (bytes > 40)) if ((!ptr) && (bytes > 40))
{ {