mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/driver/pictureviewer/pictureviewer.cpp: move free handlers to ~CPictureViewer(), fix segfault aufter commit d67b0305ab

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9672968ecf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)

Origin message was:
------------------
src/driver/pictureviewer/pictureviewer.cpp: move free handlers to ~CPictureViewer(), fix segfault aufter commit d67b0305ab

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2013-04-24 12:03:58 +02:00
committed by [CST] Focus
parent b67287a523
commit 9eef0bd94c
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -368,6 +368,17 @@ CPictureViewer::CPictureViewer ()
init_handlers ();
}
CPictureViewer::~CPictureViewer ()
{
Cleanup();
CFormathandler *fh = fh_root;
while (fh) {
CFormathandler *tmp = fh->next;
free(fh);
fh = tmp;
}
}
void CPictureViewer::showBusy (int sx, int sy, int width, char r, char g, char b)
{
// dbout("Show Busy{\n");
@@ -446,12 +457,6 @@ void CPictureViewer::Cleanup ()
free (m_CurrentPic_Buffer);
m_CurrentPic_Buffer = NULL;
}
CFormathandler *fh = fh_root;
while (fh) {
CFormathandler *tmp = fh->next;
free(fh);
fh = tmp;
}
}
void CPictureViewer::getSize(const char* name, int* width, int *height)

2
src/driver/pictureviewer/pictureviewer.h
View File

@@ -50,7 +50,7 @@ class CPictureViewer
COLOR=2
};
CPictureViewer();
~CPictureViewer(){Cleanup();};
~CPictureViewer();
bool ShowImage(const std::string & filename, bool unscaled=false);
bool DecodeImage(const std::string & name, bool showBusySign=false, bool unscaled=false);
bool DisplayNextImage();