summaryrefslogtreecommitdiff
path: root/command/video.cpp
diff options
context:
space:
mode:
authorJochen Dolze <vdr@dolze.de>2012-05-17 12:48:45 +0200
committerJochen Dolze <vdr@dolze.de>2012-05-17 12:48:45 +0200
commitf71889cd4de662eb29d706f8659e86d13a076fd2 (patch)
treef2f40415b05ebfaf18c3d39c16796f4b0eab0c21 /command/video.cpp
parent0942647e18e14cfd5f1ab651da0660618490d834 (diff)
downloadvdr-plugin-markad-f71889cd4de662eb29d706f8659e86d13a076fd2.tar.gz
vdr-plugin-markad-f71889cd4de662eb29d706f8659e86d13a076fd2.tar.bz2
Fixed warnings from cppcheck
Added setup menu entry to prevent deferred shutdown Added many logos from contributors
Diffstat (limited to 'command/video.cpp')
-rw-r--r--command/video.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/command/video.cpp b/command/video.cpp
index 0e975cd..eb6198e 100644
--- a/command/video.cpp
+++ b/command/video.cpp
@@ -23,7 +23,6 @@ cMarkAdLogo::cMarkAdLogo(MarkAdContext *maContext)
macontext=maContext;
// 3x3 GX Sobel mask
-
GX[0][0] = -1;
GX[0][1] = 0;
GX[0][2] = 1;
@@ -85,7 +84,7 @@ int cMarkAdLogo::Load(const char *directory, char *file, int plane)
}
int width,height;
- if (fscanf(pFile, "P5\n#C%i %i\n%d %d\n255\n#", &area.corner,&area.mpixel[plane],&width,&height)!=4)
+ if (fscanf(pFile, "P5\n#C%1i %3i\n%3d %3d\n255\n#", &area.corner,&area.mpixel[plane],&width,&height)!=4)
{
fclose(pFile);
return -2;