merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -77,17 +77,3 @@ FootageStream* Footage::get_stream_from_file_index(bool video, int index) {
  }
  return nullptr;
 }
-
-void FootageStream::make_square_thumb() {
-  // generate square version for QListView?
-  int square_size = qMax(video_preview.width(), video_preview.height());
-  QPixmap pixmap(square_size, square_size);
-  pixmap.fill(Qt::transparent);
-  QPainter p(&pixmap);
-  int diff = (video_preview.width() - video_preview.height())>>1;
-  int sqx = (diff < 0) ? -diff : 0;
-  int sqy = (diff > 0) ? diff : 0;
-  p.drawImage(sqx, sqy, video_preview);
-  p.end();
-  video_preview_square = QIcon(pixmap);
-}