github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 02:37:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Windows 10 incompatibility with 1809

Browse source 
Removed experimental QR code
Updated dependencies.
This commit is contained in:
Robin 2020-04-12 23:23:02 +02:00
commit 3055d42689
16 changed files with 18 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

17
GreenshotPlugin/Core/Capture.cs
View file

@ -2,11 +2,9 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.Linq;
using GreenshotPlugin.Interfaces;
using GreenshotPlugin.Interfaces.Ocr;
using log4net;
using ZXing;
namespace GreenshotPlugin.Core
{
@ -20,7 +18,7 @@ namespace GreenshotPlugin.Core
private Rectangle _screenBounds;
/// <summary>
/// Get/Set the Screenbounds
/// Get/Set the screen bounds
/// </summary>
public Rectangle ScreenBounds {
get {
@ -180,19 +178,6 @@ namespace GreenshotPlugin.Core
// TODO: Remove invisible lines/words?
CaptureDetails.OcrInformation?.Offset(-cropRectangle.Location.X, -cropRectangle.Location.Y);
// Offset the Qr information
// TODO: Remove invisible QR codes?
var oldQrResult = CaptureDetails.QrResult;
if (oldQrResult != null)
{
CaptureDetails.OcrInformation?.Offset(-cropRectangle.Location.X, -cropRectangle.Location.Y);
var offsetPoints = CaptureDetails.QrResult.ResultPoints
.Select(p => new ResultPoint(p.X - cropRectangle.Location.X, p.Y - cropRectangle.Location.Y)).ToArray();
var newQqResult = new Result(oldQrResult.Text, oldQrResult.RawBytes, offsetPoints, oldQrResult.BarcodeFormat);
CaptureDetails.QrResult = newQqResult;
}
// Remove invisible elements
var visibleElements = new List<ICaptureElement>();
foreach(var captureElement in _elements) {