Merge branch 'Helper_Variablen' into 'dev-stupidrenderer'

# Conflicts:
#   src/Image/IntelliImage.h
#   src/IntelliPhoto.pro
#   src/Layer/PaintingArea.h
This commit is contained in:
Bastian Schindler
2020-01-09 00:10:40 +00:00
14 changed files with 111 additions and 204 deletions

View File

@@ -40,20 +40,13 @@ QImage imageData;
* \brief The Type, an Image is.
*/
ImageType TypeOfImage;
/*!
* \brief fastRenderer is the flag that represents the usage of 8bit pictures.
*/
bool fastRenderer;
public:
/*!
* \brief The Construcor of the IntelliImage. Given the Image dimensions.
* \param width - The width of the Image.
* \param height - The height of the Image.
* \param fastRendererOn - Represents the flag for 8bit picture handelling.
*/
IntelliImage(int width, int height, bool fastRendererOn);
IntelliImage(int width, int height);
/*!
* \brief An Abstract Destructor.
@@ -148,13 +141,6 @@ virtual bool loadImage(const QString &filePath);
* \return The color of the Pixel as QColor.
*/
virtual QColor getPixelColor(QPoint& point);
/*!
* \brief updateRendererSetting updates the existing image format to the new format.
* \param fastRendererOn flag for the 8bit image handeling.
*/
virtual void updateRendererSetting(bool fastRendererOn);
};
#endif