diff --git a/Common/3dParty/hunspell/qt/hunspell.pri b/Common/3dParty/hunspell/qt/hunspell.pri index 6e223f0bdc..4d806a9c07 100644 --- a/Common/3dParty/hunspell/qt/hunspell.pri +++ b/Common/3dParty/hunspell/qt/hunspell.pri @@ -39,4 +39,4 @@ HEADERS += \ $$PWD/../hunspell/phonet.hxx \ $$PWD/../hunspell/replist.hxx \ $$PWD/../hunspell/suggestmgr.hxx \ - $$PWD/../hunspell/w_char.hxx + $$PWD/../hunspell/w_char.hxx \ No newline at end of file diff --git a/DesktopEditor/graphics/pro/js/qt/test/main.cpp b/DesktopEditor/graphics/pro/js/qt/test/main.cpp index 10ff5b8d99..ec80daaf87 100644 --- a/DesktopEditor/graphics/pro/js/qt/test/main.cpp +++ b/DesktopEditor/graphics/pro/js/qt/test/main.cpp @@ -20,8 +20,9 @@ int main() int nCountInt = 4 * Raster_GetHeight(img) * Raster_GetWidth(img); for (int i = 0; i < (nCountInt > 100 ? 100 : nCountInt); i++) - std::cout << pResInt[i] << " "; + std::cout << (int)pResInt[i] << " "; + img->SaveFile(NSFile::GetProcessDirectory() + L"/res.jpg", 3); Raster_Destroy(img); return 0; } diff --git a/DesktopEditor/graphics/pro/js/qt/test/test.pro b/DesktopEditor/graphics/pro/js/qt/test/test.pro index bd4084b2d7..950615f231 100644 --- a/DesktopEditor/graphics/pro/js/qt/test/test.pro +++ b/DesktopEditor/graphics/pro/js/qt/test/test.pro @@ -14,4 +14,4 @@ CORE_ROOT_DIR = $$PWD/../../../../../.. PWD_ROOT_DIR = $$PWD include($$CORE_ROOT_DIR/Common/base.pri) -ADD_DEPENDENCY(kernel, Raster) +ADD_DEPENDENCY(kernel, Raster, graphics) diff --git a/DesktopEditor/raster/BgraFrame.h b/DesktopEditor/raster/BgraFrame.h index 326ee2bbbb..d70d0c679e 100644 --- a/DesktopEditor/raster/BgraFrame.h +++ b/DesktopEditor/raster/BgraFrame.h @@ -41,13 +41,13 @@ class GRAPHICS_DECL CBgraFrame { private: - int m_nFileType; + int m_nFileType; - int m_lWidth; - int m_lHeight; - int m_lStride; + int m_lWidth; + int m_lHeight; + int m_lStride; - BYTE* m_pData; + BYTE* m_pData; BYTE* m_pPalette; int m_lPaletteColors; @@ -87,14 +87,14 @@ public: void SetJpegQuality(const double& value); - bool OpenFile(const std::wstring& strFileName, unsigned int nFileType = 0); //0 - detect + bool OpenFile(const std::wstring& strFileName, unsigned int nFileType = 0); //0 - detect bool SaveFile(const std::wstring& strFileName, unsigned int nFileType); bool Decode(BYTE* pBuffer, int nSize, unsigned int nFileType = 0); bool Encode(BYTE*& pBuffer, int& nSize, unsigned int nFileType); - bool Resize(const long& nNewWidth, const long& nNewHeight, bool bDestroyData = true); + bool Resize(const long& nNewWidth, const long& nNewHeight, bool bDestroyData = true); - bool ReColorPatternImage(const std::wstring& strFileName, unsigned int rgbColorBack, unsigned int rgbColorFore); + bool ReColorPatternImage(const std::wstring& strFileName, unsigned int rgbColorBack, unsigned int rgbColorFore); void FromImage(IGrObject* pGraphics, bool bIsCopy = true); }; diff --git a/DesktopEditor/raster/ImageFileFormatChecker.h b/DesktopEditor/raster/ImageFileFormatChecker.h index 7f610aba15..bb845b0bb2 100644 --- a/DesktopEditor/raster/ImageFileFormatChecker.h +++ b/DesktopEditor/raster/ImageFileFormatChecker.h @@ -82,7 +82,7 @@ public: bool isRawFile(std::wstring& fileName); bool isSvgFile(std::wstring& fileName); - bool isImageFile(BYTE* pBuffer,DWORD dwBytes); + bool isImageFile(BYTE* pBuffer,DWORD dwBytes); bool isBmpFile(BYTE* pBuffer,DWORD dwBytes); bool isGifFile(BYTE* pBuffer,DWORD dwBytes); bool isPngFile(BYTE* pBuffer,DWORD dwBytes); @@ -108,7 +108,7 @@ public: bool isIpodFile(BYTE* pBuffer,DWORD dwBytes); bool isPgxFile(BYTE* pBuffer,DWORD dwBytes); bool isSvgFile(BYTE* pBuffer,DWORD dwBytes); - bool isRawFile(BYTE* pBuffer,DWORD dwBytes); + bool isRawFile(BYTE* pBuffer,DWORD dwBytes); std::wstring DetectFormatByData(BYTE *Data, int DataSize);