Fix build

poljvd · poljvd · commit 1b98924c9d92 · 2014-03-04T23:22:46.000+01:00
diff --git a/include/utils/Image.h b/include/utils/Image.h
@@ -17,8 +17,12 @@ class Image
 	/// Default constructor for an image
 	///
 	Image() :
-		Image(1, 1)
+		_width(1),
+		_height(1),
+		_pixels(new Pixel_T[2]),
+		_endOfPixels(_pixels + 1)
 	{
+		memset(_pixels, 0, 2*sizeof(Pixel_T));
 	}
 
 	///
diff --git a/src/hyperiond/CMakeLists.txt b/src/hyperiond/CMakeLists.txt
@@ -9,9 +9,12 @@ target_link_libraries(hyperiond
 		jsonserver
 		protoserver
 		boblightserver
-		v4l2-grabber
 )
 
 if (ENABLE_DISPMANX)
 	target_link_libraries(hyperiond dispmanx-grabber)
 endif (ENABLE_DISPMANX)
+
+if (ENABLE_V4L2)
+	target_link_libraries(hyperiond v4l2-grabber)
+endif (ENABLE_V4L2)

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,12 @@ class Image`
`17`	`17`	`/// Default constructor for an image`
`18`	`18`	`///`
`19`	`19`	`Image() :`
`20`		`- Image(1, 1)`
	`20`	`+ _width(1),`
	`21`	`+ _height(1),`
	`22`	`+ _pixels(new Pixel_T[2]),`
	`23`	`+ _endOfPixels(_pixels + 1)`
`21`	`24`	`{`
	`25`	`+ memset(_pixels, 0, 2*sizeof(Pixel_T));`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`///`