diff --git a/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp b/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp index e5f013b6..8ee54c00 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp @@ -162,7 +162,7 @@ string ClassFlowAlignment::getHTMLSingleStep(string host) bool ClassFlowAlignment::doFlow(string time) { if (!ImageTMP) - ImageTMP = new CImageBasis(ImageBasis, 5); + ImageTMP = new CImageBasis(ImageBasis); delete AlignAndCutImage; diff --git a/code/components/jomjol_image_proc/CImageBasis.cpp b/code/components/jomjol_image_proc/CImageBasis.cpp index 3400a780..8e8a658a 100644 --- a/code/components/jomjol_image_proc/CImageBasis.cpp +++ b/code/components/jomjol_image_proc/CImageBasis.cpp @@ -364,7 +364,8 @@ void CImageBasis::LoadFromMemory(stbi_uc *_buffer, int len) RGBImageRelease(); } -CImageBasis::CImageBasis(CImageBasis *_copyfrom, int _anzrepeat) + +CImageBasis::CImageBasis(CImageBasis *_copyfrom) { islocked = false; externalImage = false; @@ -378,15 +379,6 @@ CImageBasis::CImageBasis(CImageBasis *_copyfrom, int _anzrepeat) int memsize = width * height * channels; rgb_image = (unsigned char*)GET_MEMORY(memsize); - int anz = 1; - while (!rgb_image && (anz < _anzrepeat)) - { - ESP_LOGD(TAG, "Create Image from Copy - Memory is full - try again: %d", anz); - rgb_image = (unsigned char*) malloc(memsize); - anz++; - } - - if (!rgb_image) { ESP_LOGD(TAG, "%s", getESPHeapInfo().c_str()); @@ -399,6 +391,7 @@ CImageBasis::CImageBasis(CImageBasis *_copyfrom, int _anzrepeat) RGBImageRelease(); } + CImageBasis::CImageBasis(int _width, int _height, int _channels) { islocked = false; diff --git a/code/components/jomjol_image_proc/CImageBasis.h b/code/components/jomjol_image_proc/CImageBasis.h index eb03c71f..4983251c 100644 --- a/code/components/jomjol_image_proc/CImageBasis.h +++ b/code/components/jomjol_image_proc/CImageBasis.h @@ -67,7 +67,7 @@ class CImageBasis CImageBasis(std::string _image); CImageBasis(uint8_t* _rgb_image, int _channels, int _width, int _height, int _bpp); CImageBasis(int _width, int _height, int _channels); - CImageBasis(CImageBasis *_copyfrom, int _anzrepeat = 0); + CImageBasis(CImageBasis *_copyfrom); void Resize(int _new_dx, int _new_dy); void Resize(int _new_dx, int _new_dy, CImageBasis *_target);