From 823ae323f37c589c4c68d617df3acf1641aeda54 Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 1 Jan 2013 21:42:32 +0000
Subject: [PATCH] fpvviewer: Adjusts to the new way of rendering

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2613 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 applications/fpvviewer/fpvv_mainform.lfm | 36 ++++++++++++------------
 applications/fpvviewer/fpvv_mainform.pas |  3 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/applications/fpvviewer/fpvv_mainform.lfm b/applications/fpvviewer/fpvv_mainform.lfm
index ceb506a86..06aabe6cb 100644
--- a/applications/fpvviewer/fpvv_mainform.lfm
+++ b/applications/fpvviewer/fpvv_mainform.lfm
@@ -65,7 +65,7 @@ object frmFPVViewer: TfrmFPVViewer
     TabOrder = 1
     object editFileName: TFileNameEdit
       Left = 8
-      Height = 23
+      Height = 22
       Top = 8
       Width = 304
       DialogOptions = []
@@ -87,7 +87,7 @@ object frmFPVViewer: TfrmFPVViewer
     end
     object spinScale: TFloatSpinEdit
       Left = 72
-      Height = 23
+      Height = 16
       Top = 97
       Width = 168
       DecimalPlaces = 6
@@ -100,9 +100,9 @@ object frmFPVViewer: TfrmFPVViewer
     end
     object Label1: TLabel
       Left = 8
-      Height = 15
+      Height = 16
       Top = 97
-      Width = 46
+      Width = 55
       Caption = 'Scale by:'
       ParentColor = False
     end
@@ -144,15 +144,15 @@ object frmFPVViewer: TfrmFPVViewer
     end
     object Label2: TLabel
       Left = 8
-      Height = 15
+      Height = 16
       Top = 72
-      Width = 73
+      Width = 88
       Caption = 'Y adjustment:'
       ParentColor = False
     end
     object spinAdjustY: TSpinEdit
       Left = 80
-      Height = 23
+      Height = 16
       Top = 72
       Width = 72
       Increment = 100
@@ -162,7 +162,7 @@ object frmFPVViewer: TfrmFPVViewer
     end
     object spinAdjustX: TSpinEdit
       Left = 232
-      Height = 23
+      Height = 16
       Top = 72
       Width = 72
       Increment = 50
@@ -172,9 +172,9 @@ object frmFPVViewer: TfrmFPVViewer
     end
     object Label3: TLabel
       Left = 160
-      Height = 15
+      Height = 16
       Top = 72
-      Width = 73
+      Width = 88
       Caption = 'X adjustment:'
       ParentColor = False
     end
@@ -189,18 +189,18 @@ object frmFPVViewer: TfrmFPVViewer
     end
     object Label4: TLabel
       Left = 9
-      Height = 15
+      Height = 16
       Top = 126
-      Width = 128
+      Width = 153
       Caption = 'Force encoding on read:'
       ParentColor = False
     end
     object comboEncoding: TComboBox
       Left = 144
-      Height = 23
+      Height = 20
       Top = 126
       Width = 128
-      ItemHeight = 15
+      ItemHeight = 0
       ItemIndex = 0
       Items.Strings = (
         'Read from the file'
@@ -236,17 +236,17 @@ object frmFPVViewer: TfrmFPVViewer
     end
     object labelFileEncoding: TLabel
       Left = 278
-      Height = 15
+      Height = 16
       Top = 130
-      Width = 74
+      Width = 88
       Caption = 'File encoding:'
       ParentColor = False
     end
     object checkForceWhiteBackground: TCheckBox
       Left = 9
-      Height = 19
+      Height = 18
       Top = 152
-      Width = 153
+      Width = 178
       Caption = 'Force white background?'
       TabOrder = 11
     end
diff --git a/applications/fpvviewer/fpvv_mainform.pas b/applications/fpvviewer/fpvv_mainform.pas
index b4610a8c9..a275e4761 100644
--- a/applications/fpvviewer/fpvv_mainform.pas
+++ b/applications/fpvviewer/fpvv_mainform.pas
@@ -120,8 +120,7 @@ begin
     if checkForceWhiteBackground.Checked then Vec.GetPage(0).BackgroundColor := colWhite;
     if not checkForceWhiteBackground.Checked then
       Vec.GetPage(0).DrawBackground(Drawer.Drawing.Canvas);
-    DrawFPVectorialToCanvas(
-      Vec.GetPage(0),
+    Vec.GetPage(0).Render(
       Drawer.Drawing.Canvas,
       FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + spinAdjustX.Value,
       Drawer.Drawing.Height - FPVVIEWER_SPACE_FOR_NEGATIVE_COORDS + spinAdjustY.Value,