Mercurial > hg > orthanc
annotate Core/Images/JpegErrorManager.cpp @ 2445:6e5bc5c6d1a4
Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005)
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 14 Dec 2017 13:02:06 +0100 |
| parents | a3a65de1840f |
| children | 878b59270859 |
| rev | line source |
|---|---|
| 1604 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
| 1604 | 4 * Department, University Hospital of Liege, Belgium |
|
2244
a3a65de1840f
shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
5 * Copyright (C) 2017 Osimis, Belgium |
| 1604 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
| 34 #include "../PrecompiledHeaders.h" | |
| 35 #include "JpegErrorManager.h" | |
| 36 | |
| 37 namespace Orthanc | |
| 38 { | |
| 39 namespace Internals | |
| 40 { | |
| 41 void JpegErrorManager::OutputMessage(j_common_ptr cinfo) | |
| 42 { | |
| 43 char message[JMSG_LENGTH_MAX]; | |
| 44 (*cinfo->err->format_message) (cinfo, message); | |
| 45 | |
| 46 JpegErrorManager* that = reinterpret_cast<JpegErrorManager*>(cinfo->err); | |
| 47 that->message = std::string(message); | |
| 48 } | |
| 49 | |
| 50 | |
| 51 void JpegErrorManager::ErrorExit(j_common_ptr cinfo) | |
| 52 { | |
| 53 (*cinfo->err->output_message) (cinfo); | |
| 54 | |
| 55 JpegErrorManager* that = reinterpret_cast<JpegErrorManager*>(cinfo->err); | |
| 56 longjmp(that->setjmp_buffer, 1); | |
| 57 } | |
| 58 | |
| 59 | |
| 60 JpegErrorManager::JpegErrorManager() | |
| 61 { | |
| 62 memset(&pub, 0, sizeof(struct jpeg_error_mgr)); | |
| 63 memset(&setjmp_buffer, 0, sizeof(jmp_buf)); | |
| 64 | |
| 65 jpeg_std_error(&pub); | |
| 66 pub.error_exit = ErrorExit; | |
| 67 pub.output_message = OutputMessage; | |
| 68 } | |
| 69 } | |
| 70 } |