Re-land else-after-returns
[pdfium.git] / core / src / fxcodec / codec / fx_codec_jpx_opj.cpp
index 7dd91b3..2d395b0 100644 (file)
@@ -1,16 +1,16 @@
 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 #include <limits>
 
+#include "../../../../third_party/lcms2-2.6/include/lcms2.h"
+#include "../../../../third_party/libopenjpeg20/openjpeg.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "codec_int.h"
-#include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h"
-#include "../lcms2/include/fx_lcms2.h"
 
 static void fx_error_callback(const char *msg, void *client_data)
 {
@@ -582,7 +582,7 @@ void color_apply_conversion(opj_image_t *image)
         return;
     }
 }
-class CJPX_Decoder 
+class CJPX_Decoder
 {
 public:
     CJPX_Decoder();