Merge branch 'master' of github.com:dankamongmen/notcurses

CMakeLists.txt

@@ -508,11 +508,12 @@ install(FILES
 )
 
 install(TARGETS notcurses-demo DESTINATION bin)
+install(TARGETS notcurses-input DESTINATION bin)
+install(TARGETS notcurses-ncreel DESTINATION bin)
+install(TARGETS notcurses-tester DESTINATION bin)
 if(NOT "${DISABLE_FFMPEG}")
 install(TARGETS notcurses-view DESTINATION bin)
 endif()
-install(TARGETS notcurses-input DESTINATION bin)
-install(TARGETS notcurses-ncreel DESTINATION bin)
 install(TARGETS notcurses
   LIBRARY
     DESTINATION ${CMAKE_INSTALL_LIBDIR}

debian/control

@@ -79,7 +79,8 @@ Description: Binaries from libnotcurses
  an API similar to that of Curses, and rides atop libtinfo.
  .
  These utilities from the notcurses project include notcurses-demo,
- notcurses-view, notcurses-planereel, and notcurses-input.
+ notcurses-view, notcurses-planereel, and notcurses-input. In
+ addition, the unit tests are bundled as notcurses-tester.
 
 Package: notcurses-data
 Architecture: all

src/demo/highcon.c

@@ -84,7 +84,7 @@ int highcontrast_demo(struct notcurses* nc){
   // right. start at the upper left, from the logical beginning of the array.
   cell c = CELL_TRIVIAL_INITIALIZER;
   cell_set_fg_alpha(&c, CELL_ALPHA_HIGHCONTRAST);
-  const char motto[] = "high contrast text ";
+  const char motto[] = " high contrast text ";
   do{
     unsigned idx = iter % totcells; // first color for upper-left
     for(int yx = 0 ; yx < dimy * dimx ; ++yx){

tests/visual.cpp

@@ -34,7 +34,7 @@ TEST_CASE("Multimedia") {
     int averr;
     int dimy, dimx;
     ncplane_dim_yx(ncp_, &dimy, &dimx);
-    auto ncv = ncvisual_open_plane(nc_, find_data("dsscaw-purp.png"), &averr, 0, 0, NCSCALE_STRETCH);
+    auto ncv = ncvisual_open_plane(nc_, find_data("changes.jpg"), &averr, 0, 0, NCSCALE_STRETCH);
     REQUIRE(ncv);
     REQUIRE(0 == averr);
     auto frame = ncvisual_decode(ncv, &averr);
@@ -54,7 +54,7 @@ TEST_CASE("Multimedia") {
     int averr;
     int dimy, dimx;
     ncplane_dim_yx(ncp_, &dimy, &dimx);
-    auto ncv = ncplane_visual_open(ncp_, find_data("dsscaw-purp.png"), &averr);
+    auto ncv = ncplane_visual_open(ncp_, find_data("changes.jpg"), &averr);
     REQUIRE(ncv);
     REQUIRE(0 == averr);
     auto frame = ncvisual_decode(ncv, &averr);
@@ -74,7 +74,7 @@ TEST_CASE("Multimedia") {
     int averr;
     int dimy, dimx;
     ncplane_dim_yx(ncp_, &dimy, &dimx);
-    auto ncv = ncplane_visual_open(ncp_, find_data("dsscaw-purp.png"), &averr);
+    auto ncv = ncplane_visual_open(ncp_, find_data("changes.jpg"), &averr);
     REQUIRE(ncv);
     REQUIRE(0 == averr);
     auto frame = ncvisual_decode(ncv, &averr);
@@ -123,7 +123,7 @@ TEST_CASE("Multimedia") {
     int averr;
     int dimy, dimx;
     ncplane_dim_yx(ncp_, &dimy, &dimx);
-    auto ncv = ncvisual_open_plane(nc_, find_data("fm6.mkv"), &averr, 0, 0, NCSCALE_STRETCH);
+    auto ncv = ncvisual_open_plane(nc_, find_data("notcursesI.avi"), &averr, 0, 0, NCSCALE_STRETCH);
     REQUIRE(ncv);
     CHECK(0 == averr);
     auto frame = ncvisual_decode(ncv, &averr);